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

Merge remote-tracking branch 'origin/topic/timw/clang-format-update'

Browse source 
* origin/topic/timw/clang-format-update:
  Apply some missing clang-format changes
This commit is contained in:
Tim Wojtulewicz 2021-10-21 17:23:46 -07:00
commit 20d1b89caa
6 changed files with 28 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
4.2.0-dev.277 | 2021-10-21 17:23:46 -0700
* Apply some missing clang-format changes (Tim Wojtulewicz, Corelight)
4.2.0-dev.274 | 2021-10-20 11:13:16 -0700 4.2.0-dev.274 | 2021-10-20 11:13:16 -0700
* Remove trailing whitespace from script files (Tim Wojtulewicz, Corelight) * Remove trailing whitespace from script files (Tim Wojtulewicz, Corelight)

2
VERSION
View file

@ -1 +1 @@
4.2.0-dev.274 4.2.0-dev.277

3
src/Expr.cc
View file

@ -4328,8 +4328,7 @@ InExpr::InExpr(ExprPtr arg_op1, ExprPtr arg_op2)
return; return;
} }
if ( op2->GetType()->Tag() == TYPE_TABLE && if ( op2->GetType()->Tag() == TYPE_TABLE && op2->GetType()->AsTableType()->IsSubNetIndex() )
op2->GetType()->AsTableType()->IsSubNetIndex() )
{ {
SetType(base_type(TYPE_BOOL)); SetType(base_type(TYPE_BOOL));
return; return;

20
src/analyzer/protocol/dns/DNS.cc
View file

@ -1696,7 +1696,7 @@ bool DNS_Interpreter::ParseRR_CAA(detail::DNS_MsgInfo* msg, const u_char*& data,
} }
bool DNS_Interpreter::ParseRR_SVCB(detail::DNS_MsgInfo* msg, const u_char*& data, int& len, bool DNS_Interpreter::ParseRR_SVCB(detail::DNS_MsgInfo* msg, const u_char*& data, int& len,
int rdlength, const u_char* msg_start, const RR_Type& svcb_type) int rdlength, const u_char* msg_start, const RR_Type& svcb_type)
{ {
const u_char* data_start = data; const u_char* data_start = data;
// the smallest SVCB/HTTPS rr is 3 bytes: // the smallest SVCB/HTTPS rr is 3 bytes:
@ -1721,12 +1721,13 @@ bool DNS_Interpreter::ParseRR_SVCB(detail::DNS_MsgInfo* msg, const u_char*& data
{ {
target_name[0] = '.'; target_name[0] = '.';
target_name[1] = '\0'; target_name[1] = '\0';
name_end = target_name+1; name_end = target_name + 1;
} }
SVCB_DATA svcb_data = { SVCB_DATA svcb_data = {
.svc_priority = svc_priority, .svc_priority = svc_priority,
.target_name = make_intrusive<StringVal>(new String(target_name, name_end - target_name, true)), .target_name = make_intrusive<StringVal>(
new String(target_name, name_end - target_name, true)),
}; };
// TODO: parse svcparams // TODO: parse svcparams
@ -1735,21 +1736,22 @@ bool DNS_Interpreter::ParseRR_SVCB(detail::DNS_MsgInfo* msg, const u_char*& data
std::ptrdiff_t parsed_bytes = data - data_start; std::ptrdiff_t parsed_bytes = data - data_start;
if ( parsed_bytes < rdlength ) if ( parsed_bytes < rdlength )
{ {
len -= ( rdlength - parsed_bytes ); len -= (rdlength - parsed_bytes);
data += ( rdlength - parsed_bytes ); data += (rdlength - parsed_bytes);
} }
switch( svcb_type ) switch ( svcb_type )
{ {
case detail::TYPE_SVCB: case detail::TYPE_SVCB:
analyzer->EnqueueConnEvent(dns_SVCB, analyzer->ConnVal(), msg->BuildHdrVal(), analyzer->EnqueueConnEvent(dns_SVCB, analyzer->ConnVal(), msg->BuildHdrVal(),
msg->BuildAnswerVal(), msg->BuildSVCB_Val(svcb_data)); msg->BuildAnswerVal(), msg->BuildSVCB_Val(svcb_data));
break; break;
case detail::TYPE_HTTPS: case detail::TYPE_HTTPS:
analyzer->EnqueueConnEvent(dns_HTTPS, analyzer->ConnVal(), msg->BuildHdrVal(), analyzer->EnqueueConnEvent(dns_HTTPS, analyzer->ConnVal(), msg->BuildHdrVal(),
msg->BuildAnswerVal(), msg->BuildSVCB_Val(svcb_data)); msg->BuildAnswerVal(), msg->BuildSVCB_Val(svcb_data));
break; break;
default: break; // unreachable. for suppressing compiler warnings. default:
break; // unreachable. for suppressing compiler warnings.
} }
return true; return true;
} }

9
src/analyzer/protocol/dns/DNS.h
View file

@ -71,7 +71,9 @@ enum RR_Type
TYPE_DS = 43, ///< Delegation signer (RFC 4034) TYPE_DS = 43, ///< Delegation signer (RFC 4034)
TYPE_NSEC3 = 50, TYPE_NSEC3 = 50,
TYPE_NSEC3PARAM = 51, ///< Contains the NSEC3 parameters (RFC 5155) TYPE_NSEC3PARAM = 51, ///< Contains the NSEC3 parameters (RFC 5155)
TYPE_SVCB = 64, ///< SerViCe Binding (RFC draft: https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-07#section-1.1) TYPE_SVCB =
64, ///< SerViCe Binding (RFC draft:
///< https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-07#section-1.1)
TYPE_HTTPS = 65, ///< HTTPS record (HTTPS specific SVCB resource record) TYPE_HTTPS = 65, ///< HTTPS record (HTTPS specific SVCB resource record)
// Obsoleted // Obsoleted
TYPE_SPF = 99, ///< Alternative: storing SPF data in TXT records, using the same format (RFC TYPE_SPF = 99, ///< Alternative: storing SPF data in TXT records, using the same format (RFC
@ -150,7 +152,8 @@ enum DNSSEC_Digest
SHA384 = 4, SHA384 = 4,
}; };
///< all keys are defined in RFC draft https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-07#section-14.3.2 ///< all keys are defined in RFC draft
///< https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-07#section-14.3.2
enum SVCPARAM_Key enum SVCPARAM_Key
{ {
mandatory = 0, mandatory = 0,
@ -415,7 +418,7 @@ protected:
bool ParseRR_LOC(detail::DNS_MsgInfo* msg, const u_char*& data, int& len, int rdlength, bool ParseRR_LOC(detail::DNS_MsgInfo* msg, const u_char*& data, int& len, int rdlength,
const u_char* msg_start); const u_char* msg_start);
bool ParseRR_SVCB(detail::DNS_MsgInfo* msg, const u_char*& data, int& len, int rdlength, bool ParseRR_SVCB(detail::DNS_MsgInfo* msg, const u_char*& data, int& len, int rdlength,
const u_char* msg_start, const RR_Type& svcb_type); const u_char* msg_start, const RR_Type& svcb_type);
void SendReplyOrRejectEvent(detail::DNS_MsgInfo* msg, EventHandlerPtr event, void SendReplyOrRejectEvent(detail::DNS_MsgInfo* msg, EventHandlerPtr event,
const u_char*& data, int& len, String* question_name, const u_char*& data, int& len, String* question_name,
String* original_name); String* original_name);

5
src/net_util.h
View file

@ -21,12 +21,17 @@ enum IPFamily
IPv6 IPv6
}; };
// Force these files to stay in this order. Normally, clang-format
// wants to move sys/types.h to the end of this block, but that
// breaks FreeBSD builds.
// clang-format off
#include <sys/types.h> #include <sys/types.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <assert.h> #include <assert.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/in_systm.h> #include <netinet/in_systm.h>
#include <netinet/ip.h> #include <netinet/ip.h>
// clang-format on
#ifdef HAVE_LINUX #ifdef HAVE_LINUX
#define __FAVOR_BSD #define __FAVOR_BSD
#endif #endif