Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 15:48:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Support basic serialization of opaque.

Browse source
This commit is contained in:
Matthias Vallentin 2012-12-04 21:44:28 -10:00
parent aba8275346
commit fa9aeeaaf1
3 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/SerialTypes.h
View file

@ -179,6 +179,7 @@ SERIAL_TYPE(SUBNET_TYPE, 8)
SERIAL_TYPE(FILE_TYPE, 9)
SERIAL_TYPE(ENUM_TYPE, 10)
SERIAL_TYPE(VECTOR_TYPE, 11)
SERIAL_TYPE(OPAQUE_TYPE, 12)
SERIAL_CONST2(ATTRIBUTES)
SERIAL_CONST2(EVENT_HANDLER)

40
src/Type.cc
View file

@ -1278,26 +1278,26 @@ void OpaqueType::Describe(ODesc* d) const
d->Add(name.c_str());
}
// TODO: Serialization semantics not yet defined.
//
// IMPLEMENT_SERIAL(OpaqueType, SER_OPAQUE_TYPE);
//
// bool OpaqueType::DoSerialize(SerialInfo* info) const
// {
// DO_SERIALIZE(SER_OPAQUE_TYPE, BroType);
// return SERIALIZE(name);
// }
//
// bool OpaqueType::DoUnserialize(UnserialInfo* info)
// {
// DO_UNSERIALIZE(BroType);
//
// char const* n;
// if ( ! UNSERIALIZE_STR(&n, 0) );
// return false;
// name = n;
// return true;
// }
IMPLEMENT_SERIAL(OpaqueType, SER_OPAQUE_TYPE);
bool OpaqueType::DoSerialize(SerialInfo* info) const
{
DO_SERIALIZE(SER_OPAQUE_TYPE, BroType);
// For now we only serialize the name of the type but will add type-specific
// serialization code here when necessary.
return SERIALIZE(name);
}
bool OpaqueType::DoUnserialize(UnserialInfo* info)
{
DO_UNSERIALIZE(BroType);
char const* n;
if ( ! UNSERIALIZE_STR(&n, 0) );
return false;
name = n;
return true;
}
EnumType::EnumType(const string& arg_name)
: BroType(TYPE_ENUM)

5
src/Type.h
View file

@ -512,10 +512,9 @@ public:
protected:
OpaqueType() { }
// TODO: Serialization semantics not yet defined.
//DECLARE_SERIAL(OpaqueType)
DECLARE_SERIAL(OpaqueType)
const string name;
string name;
};
class EnumType : public BroType {