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

Pull Cleanup: Minor changes and cleanup after merging the STP protocol builder contribution - removal of compilation errors, unncessary code, trailing whitespace

Browse Source
This commit is contained in:
Srivats P 2015-12-17 21:15:47 +05:30
parent c3c1ca84da
commit 9cd92c47ab
9 changed files with 61 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/main.cpp
View File

@ -38,23 +38,11 @@ extern ProtocolWidgetFactory *OstProtocolWidgetFactory;
QSettings *appSettings; QSettings *appSettings;
QMainWindow *mainWindow; QMainWindow *mainWindow;
#if defined(Q_OS_WIN32)
QString kGzipPathDefaultValue;
QString kDiffPathDefaultValue;
QString kAwkPathDefaultValue;
#endif
int main(int argc, char* argv[]) int main(int argc, char* argv[])
{ {
QApplication app(argc, argv); QApplication app(argc, argv);
int exitCode; int exitCode;
#if defined(Q_OS_WIN32)
kGzipPathDefaultValue = app.applicationDirPath() + "/gzip.exe";
kDiffPathDefaultValue = app.applicationDirPath() + "/diff.exe";
kAwkPathDefaultValue = app.applicationDirPath() + "/gawk.exe";
#endif
app.setApplicationName("Ostinato"); app.setApplicationName("Ostinato");
app.setOrganizationName("Ostinato"); app.setOrganizationName("Ostinato");
app.setProperty("version", version); app.setProperty("version", version);

2
common/pdmlreader.cpp
View File

@ -74,11 +74,11 @@ PdmlReader::PdmlReader(OstProto::StreamConfigList *streams)
factory_.insert("sdp", PdmlTextProtocol::createInstance); factory_.insert("sdp", PdmlTextProtocol::createInstance);
factory_.insert("sip", PdmlTextProtocol::createInstance); factory_.insert("sip", PdmlTextProtocol::createInstance);
factory_.insert("smtp", PdmlTextProtocol::createInstance); factory_.insert("smtp", PdmlTextProtocol::createInstance);
factory_.insert("stp", PdmlStpProtocol::createInstance);
factory_.insert("tcp", PdmlTcpProtocol::createInstance); factory_.insert("tcp", PdmlTcpProtocol::createInstance);
factory_.insert("udp", PdmlUdpProtocol::createInstance); factory_.insert("udp", PdmlUdpProtocol::createInstance);
factory_.insert("udplite", PdmlUdpProtocol::createInstance); factory_.insert("udplite", PdmlUdpProtocol::createInstance);
factory_.insert("vlan", PdmlVlanProtocol::createInstance); factory_.insert("vlan", PdmlVlanProtocol::createInstance);
factory_.insert("stp", PdmlStpProtocol::createInstance);
} }
PdmlReader::~PdmlReader() PdmlReader::~PdmlReader()

2
common/protocol.proto
View File

@ -140,7 +140,7 @@ message Protocol {
kDot2LlcFieldNumber = 206; kDot2LlcFieldNumber = 206;
kDot2SnapFieldNumber = 207; kDot2SnapFieldNumber = 207;
kVlanStackFieldNumber = 208; kVlanStackFieldNumber = 208;
kStpFieldNumber = 210; kStpFieldNumber = 209;
kArpFieldNumber = 300; kArpFieldNumber = 300;
kIp4FieldNumber = 301; kIp4FieldNumber = 301;

17
common/stp.cpp
View File

@ -75,11 +75,6 @@ QString StpProtocol::shortName() const
return QString("STP"); return QString("STP");
} }
AbstractProtocol::ProtocolIdType StpProtocol::protocolIdType() const
{
return ProtocolIdLlc;
}
quint32 StpProtocol::protocolId(ProtocolIdType type) const quint32 StpProtocol::protocolId(ProtocolIdType type) const
{ {
switch(type) switch(type)
@ -234,15 +229,15 @@ QVariant StpProtocol::fieldData(int index, FieldAttrib attrib,
case FieldName: case FieldName:
return QString("Root Identifier"); return QString("Root Identifier");
case FieldValue: case FieldValue:
return (qulonglong) data_.root_id(); return (quint64) data_.root_id();
case FieldTextValue: case FieldTextValue:
{ {
// Root ID contain two value: // Root ID contain two value:
// Root ID Priority(first 2 bytes) // Root ID Priority(first 2 bytes)
// and Root ID MAC (last 6 bytes). (IEEE802.1D-2008) // and Root ID MAC (last 6 bytes). (IEEE802.1D-2008)
quint16 priority = ( quint16 priority = (
data_.root_id() & 0xFFFF000000000000) >> (BYTES_TO_BITS(6)); data_.root_id() & 0xFFFF000000000000ULL) >> (BYTES_TO_BITS(6));
quint64 mac = data_.root_id() & 0x0000FFFFFFFFFFFF; quint64 mac = data_.root_id() & 0x0000FFFFFFFFFFFFULL;
return QString("Priority: %1 / MAC: %2") return QString("Priority: %1 / MAC: %2")
.arg(QString::number(priority), .arg(QString::number(priority),
uintToMacStr(mac)); uintToMacStr(mac));
@ -292,15 +287,15 @@ QVariant StpProtocol::fieldData(int index, FieldAttrib attrib,
case FieldName: case FieldName:
return QString("Bridge Identifier"); return QString("Bridge Identifier");
case FieldValue: case FieldValue:
return (qulonglong) data_.bridge_id(); return (quint64) data_.bridge_id();
case FieldTextValue: case FieldTextValue:
{ {
// Bridge ID contain two value: // Bridge ID contain two value:
// Bridge ID Priority(first 2 bytes) // Bridge ID Priority(first 2 bytes)
// and Bridge ID MAC (last 6 bytes). (IEEE802.1D-2008) // and Bridge ID MAC (last 6 bytes). (IEEE802.1D-2008)
quint16 priority = (data_.bridge_id() & 0xFFFF000000000000 quint16 priority = (data_.bridge_id() & 0xFFFF000000000000ULL
) >> (BYTES_TO_BITS(6)); ) >> (BYTES_TO_BITS(6));
quint64 mac = data_.bridge_id() & 0x0000FFFFFFFFFFFF; quint64 mac = data_.bridge_id() & 0x0000FFFFFFFFFFFFULL;
return QString("Priority: %1 / MAC: %2").arg(QString::number(priority), return QString("Priority: %1 / MAC: %2").arg(QString::number(priority),
uintToMacStr(mac)); uintToMacStr(mac));
} }

1
common/stp.h
View File

@ -89,7 +89,6 @@ public:
virtual void protoDataCopyInto(OstProto::Protocol &protocol) const; virtual void protoDataCopyInto(OstProto::Protocol &protocol) const;
virtual void protoDataCopyFrom(const OstProto::Protocol &protocol); virtual void protoDataCopyFrom(const OstProto::Protocol &protocol);
virtual ProtocolIdType protocolIdType() const;
virtual quint32 protocolId(ProtocolIdType type) const; virtual quint32 protocolId(ProtocolIdType type) const;
virtual QString name() const; virtual QString name() const;

3
common/stp.ui
View File

@ -107,9 +107,6 @@
</item> </item>
<item row="3" column="2"> <item row="3" column="2">
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item> <item>
<widget class="QCheckBox" name="ui_flags_tc_check"> <widget class="QCheckBox" name="ui_flags_tc_check">
<property name="sizePolicy"> <property name="sizePolicy">

6
common/stpconfig.cpp
View File

@ -27,7 +27,7 @@ This module is developed by PLVision <developers@plvision.eu>
#define ONE_BYTE_MAX 255 #define ONE_BYTE_MAX 255
#define TWO_BYTE_MAX 65535 #define TWO_BYTE_MAX 65535
#define FOUR_BYTE_MAX 4294967295 #define FOUR_BYTE_MAX 4294967295U
#define BIT_0 0 #define BIT_0 0
#define BIT_7 7 #define BIT_7 7
#define ONE_BIT(pos) ((unsigned int)(1 << (pos))) #define ONE_BIT(pos) ((unsigned int)(1 << (pos)))
@ -137,7 +137,7 @@ void StpConfigForm::loadWidget(AbstractProtocol *proto)
).toULongLong(&isOk); ).toULongLong(&isOk);
ui_root_id->setText( ui_root_id->setText(
QString::number(rootId & 0x0000FFFFFFFFFFFF, BASE_HEX)); QString::number(rootId & 0x0000FFFFFFFFFFFFULL, BASE_HEX));
ui_root_id_priority->setText(QString::number(rootId >> 48)); ui_root_id_priority->setText(QString::number(rootId >> 48));
ui_root_path_cost->setText( ui_root_path_cost->setText(
@ -154,7 +154,7 @@ void StpConfigForm::loadWidget(AbstractProtocol *proto)
).toULongLong(&isOk); ).toULongLong(&isOk);
ui_bridge_id->setText( ui_bridge_id->setText(
QString::number(bridgeId & 0x0000FFFFFFFFFFFF, BASE_HEX)); QString::number(bridgeId & 0x0000FFFFFFFFFFFFULL, BASE_HEX));
ui_bridge_id_priority->setText(QString::number(bridgeId >> 48)); ui_bridge_id_priority->setText(QString::number(bridgeId >> 48));
// port priority is a first byte of stp_port_id field // port priority is a first byte of stp_port_id field