forked from osmocom/wireshark
De-camel-ize "Wireshark" in a few places.
The _wslua_main struct / WireShark class appears to have never been used, so remove it. Change-Id: Id80fb2c2065accedf632ea4cc467d566d10870de Reviewed-on: https://code.wireshark.org/review/35480 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
This commit is contained in:
parent
c656affc34
commit
d614ade782
|
@ -59,9 +59,9 @@ BEGIN
|
||||||
-- To octet align the mtpAddress, the MSBs shall be encoded as 0s.
|
-- To octet align the mtpAddress, the MSBs shall be encoded as 0s.
|
||||||
...
|
...
|
||||||
}
|
}
|
||||||
-- Wireshark specific
|
-- Wireshark specific
|
||||||
MtpAddress ::= OCTET STRING(SIZE(2..4))
|
MtpAddress ::= OCTET STRING(SIZE(2..4))
|
||||||
|
|
||||||
DomainName ::= SEQUENCE
|
DomainName ::= SEQUENCE
|
||||||
{
|
{
|
||||||
name [0] IA5String,
|
name [0] IA5String,
|
||||||
|
@ -136,7 +136,7 @@ BEGIN
|
||||||
}
|
}
|
||||||
|
|
||||||
SegmentNumber ::= INTEGER(0..65535)
|
SegmentNumber ::= INTEGER(0..65535)
|
||||||
|
|
||||||
TransactionResponseAck ::= SEQUENCE OF TransactionAck
|
TransactionResponseAck ::= SEQUENCE OF TransactionAck
|
||||||
|
|
||||||
TransactionAck ::= SEQUENCE
|
TransactionAck ::= SEQUENCE
|
||||||
|
@ -155,7 +155,7 @@ BEGIN
|
||||||
-- See clause 14 for IANA considerations with respect to error codes
|
-- See clause 14 for IANA considerations with respect to error codes
|
||||||
|
|
||||||
ErrorText ::= IA5String
|
ErrorText ::= IA5String
|
||||||
|
|
||||||
ContextID ::= INTEGER(0..4294967295)
|
ContextID ::= INTEGER(0..4294967295)
|
||||||
-- Context NULL Value: 0
|
-- Context NULL Value: 0
|
||||||
-- Context CHOOSE Value: 4294967294 (0xFFFFFFFE)
|
-- Context CHOOSE Value: 4294967294 (0xFFFFFFFE)
|
||||||
|
@ -177,7 +177,7 @@ BEGIN
|
||||||
commandReply [3] SEQUENCE OF CommandReply
|
commandReply [3] SEQUENCE OF CommandReply
|
||||||
}
|
}
|
||||||
|
|
||||||
-- WireShark Specific
|
-- Wireshark Specific
|
||||||
ContextIDinList ::= INTEGER(0..4294967295)
|
ContextIDinList ::= INTEGER(0..4294967295)
|
||||||
|
|
||||||
ContextRequest ::= SEQUENCE
|
ContextRequest ::= SEQUENCE
|
||||||
|
@ -188,14 +188,14 @@ BEGIN
|
||||||
...,
|
...,
|
||||||
iepscallind [3] BOOLEAN OPTIONAL,
|
iepscallind [3] BOOLEAN OPTIONAL,
|
||||||
contextProp [4] SEQUENCE OF PropertyParm OPTIONAL,
|
contextProp [4] SEQUENCE OF PropertyParm OPTIONAL,
|
||||||
|
|
||||||
-- WireShark Specific
|
-- Wireshark Specific
|
||||||
-- contextList [5] SEQUENCE OF ContextID OPTIONAL
|
-- contextList [5] SEQUENCE OF ContextID OPTIONAL
|
||||||
contextList [5] SEQUENCE OF ContextIDinList OPTIONAL
|
contextList [5] SEQUENCE OF ContextIDinList OPTIONAL
|
||||||
-- Currently the way that WS tracing code's persistent data is
|
-- Currently the way that WS tracing code's persistent data is
|
||||||
-- organized disallows to relate a request to multiple contexts
|
-- organized disallows to relate a request to multiple contexts
|
||||||
}
|
}
|
||||||
|
|
||||||
-- When returning a contextList, the contextId in the ActionReply construct will
|
-- When returning a contextList, the contextId in the ActionReply construct will
|
||||||
-- return the contextId from the associated ActionRequest.
|
-- return the contextId from the associated ActionRequest.
|
||||||
|
|
||||||
|
@ -258,7 +258,7 @@ BEGIN
|
||||||
serviceChangeReply [7] ServiceChangeReply,
|
serviceChangeReply [7] ServiceChangeReply,
|
||||||
...
|
...
|
||||||
}
|
}
|
||||||
|
|
||||||
TopologyRequest ::= SEQUENCE
|
TopologyRequest ::= SEQUENCE
|
||||||
{
|
{
|
||||||
terminationFrom [0] TerminationID,
|
terminationFrom [0] TerminationID,
|
||||||
|
@ -549,15 +549,15 @@ BEGIN
|
||||||
}
|
}
|
||||||
|
|
||||||
-- EventName ::= PkgdName
|
-- EventName ::= PkgdName
|
||||||
EventName ::= OCTET STRING
|
EventName ::= OCTET STRING
|
||||||
|
|
||||||
EventParameter ::= SEQUENCE
|
EventParameter ::= SEQUENCE
|
||||||
{
|
{
|
||||||
-- Wireshark specific
|
-- Wireshark specific
|
||||||
-- eventParameterName [0] Name,
|
-- eventParameterName [0] Name,
|
||||||
-- value [1] Value,
|
-- value [1] Value,
|
||||||
eventParameterName [0] EventParameterName,
|
eventParameterName [0] EventParameterName,
|
||||||
eventParamValue [1] EventParamValues,
|
eventParamValue [1] EventParamValues,
|
||||||
-- end
|
-- end
|
||||||
-- For use of extraInfos see the comment related to PropertyParm
|
-- For use of extraInfos see the comment related to PropertyParm
|
||||||
extraInfo [2] CHOICE
|
extraInfo [2] CHOICE
|
||||||
|
@ -570,9 +570,9 @@ BEGIN
|
||||||
}
|
}
|
||||||
-- Wireshark specific
|
-- Wireshark specific
|
||||||
EventParameterName ::= Name
|
EventParameterName ::= Name
|
||||||
|
|
||||||
EventParamValues ::= SEQUENCE OF EventParamValue
|
EventParamValues ::= SEQUENCE OF EventParamValue
|
||||||
|
|
||||||
EventParamValue ::= OCTET STRING
|
EventParamValue ::= OCTET STRING
|
||||||
-- end
|
-- end
|
||||||
ServiceChangeRequest ::= SEQUENCE
|
ServiceChangeRequest ::= SEQUENCE
|
||||||
|
@ -691,7 +691,7 @@ BEGIN
|
||||||
}
|
}
|
||||||
|
|
||||||
Name ::= OCTET STRING(SIZE(2))
|
Name ::= OCTET STRING(SIZE(2))
|
||||||
|
|
||||||
PkgdName ::= OCTET STRING(SIZE(4))
|
PkgdName ::= OCTET STRING(SIZE(4))
|
||||||
-- represents Package Name (2 octets) plus property, event,
|
-- represents Package Name (2 octets) plus property, event,
|
||||||
-- signal names or StatisticsID. (2 octets)
|
-- signal names or StatisticsID. (2 octets)
|
||||||
|
@ -814,7 +814,7 @@ BEGIN
|
||||||
digitMapName [0] DigitMapName,
|
digitMapName [0] DigitMapName,
|
||||||
digitMapValue [1] DigitMapValue
|
digitMapValue [1] DigitMapValue
|
||||||
}
|
}
|
||||||
|
|
||||||
SecondEventsDescriptor ::= SEQUENCE
|
SecondEventsDescriptor ::= SEQUENCE
|
||||||
{
|
{
|
||||||
requestID [0] RequestID OPTIONAL,
|
requestID [0] RequestID OPTIONAL,
|
||||||
|
@ -840,7 +840,7 @@ BEGIN
|
||||||
notifyBehaviour [3] NotifyBehaviour OPTIONAL,
|
notifyBehaviour [3] NotifyBehaviour OPTIONAL,
|
||||||
resetEventsDescriptor [4] NULL OPTIONAL
|
resetEventsDescriptor [4] NULL OPTIONAL
|
||||||
}
|
}
|
||||||
|
|
||||||
EventBufferDescriptor ::= SEQUENCE OF EventSpec
|
EventBufferDescriptor ::= SEQUENCE OF EventSpec
|
||||||
|
|
||||||
EventSpec ::= SEQUENCE
|
EventSpec ::= SEQUENCE
|
||||||
|
@ -852,7 +852,7 @@ BEGIN
|
||||||
}
|
}
|
||||||
|
|
||||||
SignalsDescriptor ::= SEQUENCE OF SignalRequest
|
SignalsDescriptor ::= SEQUENCE OF SignalRequest
|
||||||
|
|
||||||
SignalRequest ::=CHOICE
|
SignalRequest ::=CHOICE
|
||||||
{
|
{
|
||||||
signal [0] Signal,
|
signal [0] Signal,
|
||||||
|
@ -898,7 +898,7 @@ BEGIN
|
||||||
}
|
}
|
||||||
|
|
||||||
-- SignalName ::= PkgdName
|
-- SignalName ::= PkgdName
|
||||||
SignalName ::= OCTET STRING
|
SignalName ::= OCTET STRING
|
||||||
|
|
||||||
NotifyCompletion ::= BIT STRING
|
NotifyCompletion ::= BIT STRING
|
||||||
{
|
{
|
||||||
|
@ -921,11 +921,11 @@ BEGIN
|
||||||
} OPTIONAL,
|
} OPTIONAL,
|
||||||
...
|
...
|
||||||
}
|
}
|
||||||
-- Wireshark specific
|
-- Wireshark specific
|
||||||
SigParameterName ::= Name
|
SigParameterName ::= Name
|
||||||
|
|
||||||
SigParamValues ::= SEQUENCE OF SigParamValue
|
SigParamValues ::= SEQUENCE OF SigParamValue
|
||||||
|
|
||||||
SigParamValue ::= OCTET STRING
|
SigParamValue ::= OCTET STRING
|
||||||
-- end
|
-- end
|
||||||
-- For an AuditCapReply with all events, the RequestID shall be ALL.
|
-- For an AuditCapReply with all events, the RequestID shall be ALL.
|
||||||
|
@ -1081,7 +1081,7 @@ BEGIN
|
||||||
}
|
}
|
||||||
|
|
||||||
H221NonStandard ::= SEQUENCE
|
H221NonStandard ::= SEQUENCE
|
||||||
{
|
{
|
||||||
t35CountryCode1 [0] INTEGER(0..255),
|
t35CountryCode1 [0] INTEGER(0..255),
|
||||||
t35CountryCode2 [1] INTEGER(0..255), -- country, as per T.35
|
t35CountryCode2 [1] INTEGER(0..255), -- country, as per T.35
|
||||||
t35Extension [2] INTEGER(0..255), -- assigned nationally
|
t35Extension [2] INTEGER(0..255), -- assigned nationally
|
||||||
|
@ -1098,4 +1098,4 @@ BEGIN
|
||||||
|
|
||||||
Value ::= SEQUENCE OF OCTET STRING
|
Value ::= SEQUENCE OF OCTET STRING
|
||||||
|
|
||||||
END
|
END
|
||||||
|
|
|
@ -345,7 +345,6 @@ typedef tvbparse_t* Parser;
|
||||||
typedef tvbparse_wanted_t* Rule;
|
typedef tvbparse_wanted_t* Rule;
|
||||||
typedef tvbparse_elem_t* Node;
|
typedef tvbparse_elem_t* Node;
|
||||||
typedef tvbparse_action_t* Shortcut;
|
typedef tvbparse_action_t* Shortcut;
|
||||||
typedef struct _wslua_main* WireShark;
|
|
||||||
typedef struct _wslua_dir* Dir;
|
typedef struct _wslua_dir* Dir;
|
||||||
typedef struct _wslua_private_table* PrivateTable;
|
typedef struct _wslua_private_table* PrivateTable;
|
||||||
typedef gchar* Struct;
|
typedef gchar* Struct;
|
||||||
|
|
|
@ -1076,7 +1076,7 @@ bool ProfileModel::exportProfiles(QString filename, QModelIndexList items, QStri
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (WireSharkZipHelper::zip(filename, files, gchar_free_to_qstring(get_profiles_dir()) + QDir::separator()) )
|
if (WiresharkZipHelper::zip(filename, files, gchar_free_to_qstring(get_profiles_dir()) + QDir::separator()) )
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
@ -1113,7 +1113,7 @@ int ProfileModel::importProfilesFromZip(QString filename, int * skippedCnt, QStr
|
||||||
int cnt = 0;
|
int cnt = 0;
|
||||||
if (dir.isValid())
|
if (dir.isValid())
|
||||||
{
|
{
|
||||||
WireSharkZipHelper::unzip(filename, dir.path(), &ProfileModel::acceptFile, &ProfileModel::cleanName);
|
WiresharkZipHelper::unzip(filename, dir.path(), &ProfileModel::acceptFile, &ProfileModel::cleanName);
|
||||||
cnt = importProfilesFromDir(dir.path(), skippedCnt, true, result);
|
cnt = importProfilesFromDir(dir.path(), skippedCnt, true, result);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#include <QDateTime>
|
#include <QDateTime>
|
||||||
#include <QMap>
|
#include <QMap>
|
||||||
|
|
||||||
bool WireSharkZipHelper::unzip(QString zipFile, QString directory, bool (*fileCheck)(QString, int), QString (*cleanName)(QString))
|
bool WiresharkZipHelper::unzip(QString zipFile, QString directory, bool (*fileCheck)(QString, int), QString (*cleanName)(QString))
|
||||||
{
|
{
|
||||||
unzFile uf = Q_NULLPTR;
|
unzFile uf = Q_NULLPTR;
|
||||||
QFileInfo fi(zipFile);
|
QFileInfo fi(zipFile);
|
||||||
|
@ -176,7 +176,7 @@ unsigned long qDateToDosDate(QDateTime time)
|
||||||
return dosDate << 16 | dosTime;
|
return dosDate << 16 | dosTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
void WireSharkZipHelper::addFileToZip(zipFile zf, QString filepath, QString fileInZip)
|
void WiresharkZipHelper::addFileToZip(zipFile zf, QString filepath, QString fileInZip)
|
||||||
{
|
{
|
||||||
QFileInfo fi(filepath);
|
QFileInfo fi(filepath);
|
||||||
zip_fileinfo zi;
|
zip_fileinfo zi;
|
||||||
|
@ -217,7 +217,7 @@ void WireSharkZipHelper::addFileToZip(zipFile zf, QString filepath, QString file
|
||||||
zipCloseFileInZip(zf);
|
zipCloseFileInZip(zf);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool WireSharkZipHelper::zip(QString fileName, QStringList files, QString relativeTo)
|
bool WiresharkZipHelper::zip(QString fileName, QStringList files, QString relativeTo)
|
||||||
{
|
{
|
||||||
|
|
||||||
QFileInfo fi(fileName);
|
QFileInfo fi(fileName);
|
||||||
|
@ -237,7 +237,7 @@ bool WireSharkZipHelper::zip(QString fileName, QStringList files, QString relati
|
||||||
while (fileInZip.length() > 0 && fileInZip.startsWith(QDir::separator()))
|
while (fileInZip.length() > 0 && fileInZip.startsWith(QDir::separator()))
|
||||||
fileInZip = fileInZip.right(fileInZip.length() - 1);
|
fileInZip = fileInZip.right(fileInZip.length() - 1);
|
||||||
|
|
||||||
WireSharkZipHelper::addFileToZip(zf, sf.absoluteFilePath(), fileInZip);
|
WiresharkZipHelper::addFileToZip(zf, sf.absoluteFilePath(), fileInZip);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
|
|
||||||
#include "minizip/zip.h"
|
#include "minizip/zip.h"
|
||||||
|
|
||||||
class WireSharkZipHelper
|
class WiresharkZipHelper
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
static bool zip(QString zipFile, QStringList files, QString relativeTo = QString());
|
static bool zip(QString zipFile, QStringList files, QString relativeTo = QString());
|
||||||
|
|
Loading…
Reference in New Issue