Reformat Zeek in Spicy style

This largely copies over Spicy's `.clang-format` configuration file. The
one place where we deviate is header include order since Zeek depends on
headers being included in a certain order.
This commit is contained in:
Benjamin Bannier 2023-10-10 21:13:34 +02:00
parent 7b8e7ed72c
commit f5a76c1aed
786 changed files with 131714 additions and 153609 deletions

View file

@ -13,131 +13,114 @@
#include "zeek/IPAddr.h"
#include "zeek/Reporter.h"
const char* transport_proto_string(TransportProto proto)
{
switch ( proto )
{
case TRANSPORT_TCP:
return "tcp";
case TRANSPORT_UDP:
return "udp";
case TRANSPORT_ICMP:
return "icmp";
case TRANSPORT_UNKNOWN:
default:
return "unknown";
}
}
const char* transport_proto_string(TransportProto proto) {
switch ( proto ) {
case TRANSPORT_TCP: return "tcp";
case TRANSPORT_UDP: return "udp";
case TRANSPORT_ICMP: return "icmp";
case TRANSPORT_UNKNOWN:
default: return "unknown";
}
}
namespace zeek
{
namespace zeek {
uint16_t detail::ip4_in_cksum(const IPAddr& src, const IPAddr& dst, uint8_t next_proto,
const uint8_t* data, int len)
{
constexpr auto nblocks = 2;
detail::checksum_block blocks[nblocks];
uint16_t detail::ip4_in_cksum(const IPAddr& src, const IPAddr& dst, uint8_t next_proto, const uint8_t* data, int len) {
constexpr auto nblocks = 2;
detail::checksum_block blocks[nblocks];
ipv4_pseudo_hdr ph;
memset(&ph, 0, sizeof(ph));
ipv4_pseudo_hdr ph;
memset(&ph, 0, sizeof(ph));
src.CopyIPv4(&ph.src);
dst.CopyIPv4(&ph.dst);
ph.len = htons(static_cast<uint16_t>(len));
ph.next_proto = next_proto;
blocks[0].block = reinterpret_cast<const uint8_t*>(&ph);
blocks[0].len = sizeof(ph);
blocks[1].block = data;
blocks[1].len = len;
src.CopyIPv4(&ph.src);
dst.CopyIPv4(&ph.dst);
ph.len = htons(static_cast<uint16_t>(len));
ph.next_proto = next_proto;
blocks[0].block = reinterpret_cast<const uint8_t*>(&ph);
blocks[0].len = sizeof(ph);
blocks[1].block = data;
blocks[1].len = len;
return in_cksum(blocks, nblocks);
}
return in_cksum(blocks, nblocks);
}
uint16_t detail::ip6_in_cksum(const IPAddr& src, const IPAddr& dst, uint8_t next_proto,
const uint8_t* data, int len)
{
constexpr auto nblocks = 2;
detail::checksum_block blocks[nblocks];
uint16_t detail::ip6_in_cksum(const IPAddr& src, const IPAddr& dst, uint8_t next_proto, const uint8_t* data, int len) {
constexpr auto nblocks = 2;
detail::checksum_block blocks[nblocks];
ipv6_pseudo_hdr ph;
memset(&ph, 0, sizeof(ph));
ipv6_pseudo_hdr ph;
memset(&ph, 0, sizeof(ph));
src.CopyIPv6(&ph.src);
dst.CopyIPv6(&ph.dst);
ph.len = htonl(static_cast<uint32_t>(len));
ph.next_proto = next_proto;
blocks[0].block = reinterpret_cast<const uint8_t*>(&ph);
blocks[0].len = sizeof(ph);
blocks[1].block = data;
blocks[1].len = len;
src.CopyIPv6(&ph.src);
dst.CopyIPv6(&ph.dst);
ph.len = htonl(static_cast<uint32_t>(len));
ph.next_proto = next_proto;
blocks[0].block = reinterpret_cast<const uint8_t*>(&ph);
blocks[0].len = sizeof(ph);
blocks[1].block = data;
blocks[1].len = len;
return in_cksum(blocks, nblocks);
}
return in_cksum(blocks, nblocks);
}
// Returns the ones-complement checksum of a chunk of 'b' bytes.
int ones_complement_checksum(const void* p, int b, uint32_t sum)
{
const unsigned char* sp = (unsigned char*)p;
int ones_complement_checksum(const void* p, int b, uint32_t sum) {
const unsigned char* sp = (unsigned char*)p;
b /= 2; // convert to count of short's
b /= 2; // convert to count of short's
/* No need for endian conversions. */
while ( --b >= 0 )
{
sum += *sp + (*(sp + 1) << 8);
sp += 2;
}
/* No need for endian conversions. */
while ( --b >= 0 ) {
sum += *sp + (*(sp + 1) << 8);
sp += 2;
}
while ( sum > 0xffff )
sum = (sum & 0xffff) + (sum >> 16);
while ( sum > 0xffff )
sum = (sum & 0xffff) + (sum >> 16);
return sum;
}
return sum;
}
int ones_complement_checksum(const IPAddr& a, uint32_t sum)
{
const uint32_t* bytes;
int len = a.GetBytes(&bytes);
return ones_complement_checksum(bytes, len * 4, sum);
}
int ones_complement_checksum(const IPAddr& a, uint32_t sum) {
const uint32_t* bytes;
int len = a.GetBytes(&bytes);
return ones_complement_checksum(bytes, len * 4, sum);
}
int icmp_checksum(const struct icmp* icmpp, int len)
{
return detail::in_cksum(reinterpret_cast<const uint8_t*>(icmpp), len);
}
int icmp_checksum(const struct icmp* icmpp, int len) {
return detail::in_cksum(reinterpret_cast<const uint8_t*>(icmpp), len);
}
int mobility_header_checksum(const IP_Hdr* ip)
{
const ip6_mobility* mh = ip->MobilityHeader();
int mobility_header_checksum(const IP_Hdr* ip) {
const ip6_mobility* mh = ip->MobilityHeader();
if ( ! mh )
return 0;
if ( ! mh )
return 0;
uint32_t sum = 0;
uint8_t mh_len = 8 + 8 * mh->ip6mob_len;
uint32_t sum = 0;
uint8_t mh_len = 8 + 8 * mh->ip6mob_len;
if ( mh_len % 2 == 1 )
reporter->Weird(ip->SrcAddr(), ip->DstAddr(), "odd_mobility_hdr_len");
if ( mh_len % 2 == 1 )
reporter->Weird(ip->SrcAddr(), ip->DstAddr(), "odd_mobility_hdr_len");
sum = ones_complement_checksum(ip->SrcAddr(), sum);
sum = ones_complement_checksum(ip->DstAddr(), sum);
// Note, for IPv6, strictly speaking the protocol and length fields are
// 32 bits rather than 16 bits. But because the upper bits are all zero,
// we get the same checksum either way.
sum += htons(IPPROTO_MOBILITY);
sum += htons(mh_len);
sum = ones_complement_checksum(mh, mh_len, sum);
sum = ones_complement_checksum(ip->SrcAddr(), sum);
sum = ones_complement_checksum(ip->DstAddr(), sum);
// Note, for IPv6, strictly speaking the protocol and length fields are
// 32 bits rather than 16 bits. But because the upper bits are all zero,
// we get the same checksum either way.
sum += htons(IPPROTO_MOBILITY);
sum += htons(mh_len);
sum = ones_complement_checksum(mh, mh_len, sum);
return sum;
}
return sum;
}
int icmp6_checksum(const struct icmp* icmpp, const IP_Hdr* ip, int len)
{
// ICMP6 uses the same checksum function as ICMP4 but a different
// pseudo-header over which it is computed.
return detail::ip6_in_cksum(ip->SrcAddr(), ip->DstAddr(), IPPROTO_ICMPV6,
reinterpret_cast<const uint8_t*>(icmpp), len);
}
int icmp6_checksum(const struct icmp* icmpp, const IP_Hdr* ip, int len) {
// ICMP6 uses the same checksum function as ICMP4 but a different
// pseudo-header over which it is computed.
return detail::ip6_in_cksum(ip->SrcAddr(), ip->DstAddr(), IPPROTO_ICMPV6, reinterpret_cast<const uint8_t*>(icmpp),
len);
}
#define CLASS_A 0x00000000
#define CLASS_B 0x80000000
@ -146,69 +129,60 @@ int icmp6_checksum(const struct icmp* icmpp, const IP_Hdr* ip, int len)
#define CLASS_E 0xf0000000
#define CHECK_CLASS(addr, class) (((addr) & (class)) == (class))
char addr_to_class(uint32_t addr)
{
if ( CHECK_CLASS(addr, CLASS_E) )
return 'E';
else if ( CHECK_CLASS(addr, CLASS_D) )
return 'D';
else if ( CHECK_CLASS(addr, CLASS_C) )
return 'C';
else if ( CHECK_CLASS(addr, CLASS_B) )
return 'B';
else
return 'A';
}
char addr_to_class(uint32_t addr) {
if ( CHECK_CLASS(addr, CLASS_E) )
return 'E';
else if ( CHECK_CLASS(addr, CLASS_D) )
return 'D';
else if ( CHECK_CLASS(addr, CLASS_C) )
return 'C';
else if ( CHECK_CLASS(addr, CLASS_B) )
return 'B';
else
return 'A';
}
const char* fmt_conn_id(const IPAddr& src_addr, uint32_t src_port, const IPAddr& dst_addr,
uint32_t dst_port)
{
static char buffer[512];
const char* fmt_conn_id(const IPAddr& src_addr, uint32_t src_port, const IPAddr& dst_addr, uint32_t dst_port) {
static char buffer[512];
snprintf(buffer, sizeof(buffer), "%s:%d > %s:%d", std::string(src_addr).c_str(), src_port,
std::string(dst_addr).c_str(), dst_port);
snprintf(buffer, sizeof(buffer), "%s:%d > %s:%d", std::string(src_addr).c_str(), src_port,
std::string(dst_addr).c_str(), dst_port);
return buffer;
}
return buffer;
}
const char* fmt_conn_id(const uint32_t* src_addr, uint32_t src_port, const uint32_t* dst_addr,
uint32_t dst_port)
{
IPAddr src(IPv6, src_addr, IPAddr::Network);
IPAddr dst(IPv6, dst_addr, IPAddr::Network);
return fmt_conn_id(src, src_port, dst, dst_port);
}
const char* fmt_conn_id(const uint32_t* src_addr, uint32_t src_port, const uint32_t* dst_addr, uint32_t dst_port) {
IPAddr src(IPv6, src_addr, IPAddr::Network);
IPAddr dst(IPv6, dst_addr, IPAddr::Network);
return fmt_conn_id(src, src_port, dst, dst_port);
}
std::string fmt_mac(const unsigned char* m, int len)
{
static char buf[25];
std::string fmt_mac(const unsigned char* m, int len) {
static char buf[25];
if ( len < 8 && len != 6 )
{
*buf = '\0';
return buf;
}
if ( len < 8 && len != 6 ) {
*buf = '\0';
return buf;
}
if ( (len == 6) || (m[6] == 0 && m[7] == 0) ) // EUI-48
snprintf(buf, sizeof(buf), "%02x:%02x:%02x:%02x:%02x:%02x", m[0], m[1], m[2], m[3], m[4],
m[5]);
else
snprintf(buf, sizeof(buf), "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x", m[0], m[1], m[2],
m[3], m[4], m[5], m[6], m[7]);
if ( (len == 6) || (m[6] == 0 && m[7] == 0) ) // EUI-48
snprintf(buf, sizeof(buf), "%02x:%02x:%02x:%02x:%02x:%02x", m[0], m[1], m[2], m[3], m[4], m[5]);
else
snprintf(buf, sizeof(buf), "%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x", m[0], m[1], m[2], m[3], m[4], m[5], m[6],
m[7]);
return buf;
}
return buf;
}
uint32_t extract_uint32(const u_char* data)
{
uint32_t val;
uint32_t extract_uint32(const u_char* data) {
uint32_t val;
val = data[0] << 24;
val |= data[1] << 16;
val |= data[2] << 8;
val |= data[3];
val = data[0] << 24;
val |= data[1] << 16;
val |= data[2] << 8;
val |= data[3];
return val;
}
return val;
}
} // namespace zeek
} // namespace zeek