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

Spicy: Map Spicy's Protocol enum to Zeek's transport_proto.

Browse source 
We now hardcode this specific enum mapping to make Zeek-side usage
more convenient.

Closes #3606.
This commit is contained in:
Robin Sommer 2024-04-24 10:48:50 +02:00
parent 9132cdacd5
commit 5a74db30ef
No known key found for this signature in database
GPG key ID: D8187293B3FFE5D0
5 changed files with 85 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/spicy/runtime-support.h
View file

@ -21,6 +21,7 @@
#include <hilti/rt/fmt.h>
#include <hilti/rt/types/all.h>
#include "Val.h"
#include "zeek/Desc.h"
#include "zeek/spicy/cookie.h"
#include "zeek/spicy/manager.h"
@ -929,6 +930,19 @@ inline ValPtr to_val(const T& t, TypePtr target) {
return rval;
}
/** Maps HILTI's `Protocol` enum to Zeek's `transport_proto` enum. */
inline ValPtr to_val_for_transport_proto(int64_t val, const TypePtr& target) {
switch ( val ) {
case hilti::rt::Protocol::TCP: return id::transport_proto->GetEnumVal(::TransportProto::TRANSPORT_TCP);
case hilti::rt::Protocol::UDP: return id::transport_proto->GetEnumVal(::TransportProto::TRANSPORT_UDP);
case hilti::rt::Protocol::ICMP: return id::transport_proto->GetEnumVal(::TransportProto::TRANSPORT_ICMP);
case hilti::rt::Protocol::Undef: [[fallthrough]]; // just for readability, make Undef explicit
default: return id::transport_proto->GetEnumVal(::TransportProto::TRANSPORT_UNKNOWN);
}
hilti::rt::cannot_be_reached();
}
/**
* Converts a Spicy-side enum to a Zeek record value. The result is returned
* with ref count +1.
@ -960,6 +974,14 @@ inline ValPtr to_val(const T& t, TypePtr target) {
static_assert(std::is_signed<std::underlying_type_t<T>>{});
auto it = static_cast<int64_t>(t);
// Special case: map enum values to Zeek's semantics.
if ( target->GetName() == "transport_proto" ) {
if ( ! std::is_same_v<T, hilti::rt::Protocol> )
throw TypeMismatch(hilti::rt::demangle(typeid(t).name()), target);
return to_val_for_transport_proto(it, target);
}
// Zeek's enum can't be negative, so we swap in max_int for our Undef (-1).
if ( it == std::numeric_limits<int64_t>::max() )
// can't allow this ...