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

PCAP/PDML import: final cleanup; renamed pdml_p.* to pdmlprotocols.*

Browse Source
This commit is contained in:
Srivats P. 2011-04-13 20:57:10 +05:30
parent 486fe5dcac
commit 84544559f2
4 changed files with 29 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/ostproto.pro
View File

@ -64,8 +64,8 @@ HEADERS += \
pcapfileformat.h \
pdmlfileformat.h \
pdmlprotocol.h \
pdmlprotocols.h \
pdmlreader.h \
pdml_p.h \
protocolmanager.h \
protocollist.h \
protocollistiterator.h \
@ -109,8 +109,8 @@ SOURCES += \
pcapfileformat.cpp \
pdmlfileformat.cpp \
pdmlprotocol.cpp \
pdmlprotocols.cpp \
pdmlreader.cpp \
pdml_p.cpp \
protocolmanager.cpp \
protocollist.cpp \
protocollistiterator.cpp \

61
common/pdml_p.cpp → common/pdmlprotocols.cpp
View File

@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
*/
#include "pdml_p.h"
#include "pdmlprotocols.h"
#include "arp.pb.h"
#include "eth2.pb.h"
@ -462,6 +462,7 @@ void PdmlEthProtocol::unknownFieldHandler(QString name, int /*pos*/,
dot3->set_length(attributes.value("value").toString().toUInt(&isOk, kBaseHex));
dot3->set_is_override_length(true);
}
#if 0
else if (name == "eth.trailer")
{
QByteArray trailer = QByteArray::fromHex(
@ -479,6 +480,7 @@ void PdmlEthProtocol::unknownFieldHandler(QString name, int /*pos*/,
stream->mutable_core()->mutable_name()->append(trailer.constData(),
trailer.size());
}
#endif
}
@ -615,11 +617,11 @@ void PdmlIp4Protocol::postProtocolHandler(OstProto::Protocol *pbProto,
{
OstProto::Ip4 *ip4 = pbProto->MutableExtension(OstProto::ip4);
ip4->set_is_override_ver(true); // FIXME
ip4->set_is_override_hdrlen(true); // FIXME
ip4->set_is_override_totlen(true); // FIXME
ip4->set_is_override_proto(true); // FIXME
ip4->set_is_override_cksum(true); // FIXME
ip4->set_is_override_ver(true);
ip4->set_is_override_hdrlen(true);
ip4->set_is_override_totlen(true);
ip4->set_is_override_proto(true);
ip4->set_is_override_cksum(true);
if (options_.size())
{
@ -689,9 +691,9 @@ void PdmlIp6Protocol::postProtocolHandler(OstProto::Protocol *pbProto,
{
OstProto::Ip6 *ip6 = pbProto->MutableExtension(OstProto::ip6);
ip6->set_is_override_version(true); // FIXME
ip6->set_is_override_payload_length(true); // FIXME
ip6->set_is_override_next_header(true); // FIXME
ip6->set_is_override_version(true);
ip6->set_is_override_payload_length(true);
ip6->set_is_override_next_header(true);
}
@ -1120,19 +1122,21 @@ void PdmlTcpProtocol::unknownFieldHandler(QString name, int /*pos*/,
options_ = QByteArray::fromHex(attributes.value("value").toString().toUtf8());
else if (name == "")
{
if (attributes.value("show").toString().startsWith("TCP segment data"))
{
segmentData_ = QByteArray::fromHex(attributes.value("value").toString().toUtf8());
stream->mutable_core()->mutable_name()->insert(0,
segmentData_.constData(), segmentData_.size());
}
else if (attributes.value("show").toString().startsWith("Acknowledgement number"))
if (attributes.value("show").toString().startsWith("Acknowledgement number"))
{
bool isOk;
OstProto::Tcp *tcp = pbProto->MutableExtension(OstProto::tcp);
tcp->set_ack_num(attributes.value("value").toString().toUInt(&isOk, kBaseHex));
}
#if 0
else if (attributes.value("show").toString().startsWith("TCP segment data"))
{
segmentData_ = QByteArray::fromHex(attributes.value("value").toString().toUtf8());
stream->mutable_core()->mutable_name()->insert(0,
segmentData_.constData(), segmentData_.size());
}
#endif
}
}
@ -1143,10 +1147,10 @@ void PdmlTcpProtocol::postProtocolHandler(OstProto::Protocol *pbProto,
qDebug("Tcp: post\n");
tcp->set_is_override_src_port(true); // FIXME
tcp->set_is_override_dst_port(true); // FIXME
tcp->set_is_override_hdrlen(true); // FIXME
tcp->set_is_override_cksum(true); // FIXME
tcp->set_is_override_src_port(true);
tcp->set_is_override_dst_port(true);
tcp->set_is_override_hdrlen(true);
tcp->set_is_override_cksum(true);
if (options_.size())
{
@ -1162,23 +1166,6 @@ void PdmlTcpProtocol::postProtocolHandler(OstProto::Protocol *pbProto,
hexDump->set_pad_until_end(false);
options_.resize(0);
}
#if 0
if (segmentData_.size())
{
OstProto::Protocol *proto = stream->add_protocol();
proto->mutable_protocol_id()->set_id(
OstProto::Protocol::kHexDumpFieldNumber);
OstProto::HexDump *hexDump = proto->MutableExtension(OstProto::hexDump);
hexDump->mutable_content()->append(segmentData_.constData(),
segmentData_.size());
hexDump->set_pad_until_end(false);
segmentData_.resize(0);
}
#endif
}
// ---------------------------------------------------------- //

4
common/pdml_p.h → common/pdmlprotocols.h
View File

@ -17,8 +17,8 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>
*/
#ifndef _PDML_P_H
#define _PDML_P_H
#ifndef _PDML_PROTOCOLS_H
#define _PDML_PROTOCOLS_H
#include "pdmlprotocol.h"

2
common/pdmlreader.cpp
View File

@ -24,7 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>
#include "pcapfileformat.h"
#include "streambase.h"
#include "pdml_p.h" // TODO: Remove
#include "pdmlprotocols.h"
PdmlReader::PdmlReader(OstProto::StreamConfigList *streams)
{