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

lazy commit

Browse source
This commit is contained in:
FlyingWithJerome 2021-09-29 18:53:37 -04:00
parent 33c7fd5fba
commit b238cf3dca
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/base/init-bare.zeek
View file

@ -3887,7 +3887,7 @@ type dns_loc_rr: record {
type dns_svcb_rr: record { type dns_svcb_rr: record {
svc_priority: count; ##< Service priority. (AliasMode? ServiceMode?) svc_priority: count; ##< Service priority. (AliasMode? ServiceMode?)
target_name: string; ##< Target name, the hostname of the service endpoint. target_name: string; ##< Target name, the hostname of the service endpoint.
svc_params: table[count] of vector of string; ##< service parameters as key-value pairs svc_params: table[count] of vector of string; ##< service parameters as key-value pairs (not used at this point)
}; };
# DNS answer types. # DNS answer types.

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

@ -1727,11 +1727,11 @@ bool DNS_Interpreter::ParseRR_SVCB(detail::DNS_MsgInfo* msg, const u_char*& data
{ {
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.
} }
@ -2046,7 +2046,7 @@ RecordValPtr DNS_MsgInfo::BuildSVCB_Val(SVCB_DATA* svcb)
r->Assign(0, svcb->svc_priority); r->Assign(0, svcb->svc_priority);
r->Assign(1, make_intrusive<StringVal>(svcb->target_name)); r->Assign(1, make_intrusive<StringVal>(svcb->target_name));
// TODO: assign svcparams // TODO: assign values to svcparams
return r; return r;
} }

16
src/analyzer/protocol/dns/events.bif
View file

@ -721,9 +721,9 @@ event dns_SSHFP%(c: connection, msg: dns_msg, ans: dns_answer, algo: count, fpty
## loc: The parsed RDATA of LOC type record. ## loc: The parsed RDATA of LOC type record.
event dns_LOC%(c: connection, msg: dns_msg, ans: dns_answer, loc: dns_loc_rr%); event dns_LOC%(c: connection, msg: dns_msg, ans: dns_answer, loc: dns_loc_rr%);
## Generated for DNS replies of type *SVCB*. ## Generated for DNS replies of type *SVCB* (General Purpose Service Endpoints).
## See `RFC draft <https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-07>`__ ## See `RFC draft for DNS SVCB/HTTPS <https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-07>`__
## for more information about the DNS SVCB/HTTPS resource records. ## for more information about DNS SVCB/HTTPS resource records.
## For replies with multiple answers, an individual event of the corresponding type is raised for each. ## For replies with multiple answers, an individual event of the corresponding type is raised for each.
## ##
## c: The connection, which may be UDP or TCP depending on the type of the ## c: The connection, which may be UDP or TCP depending on the type of the
@ -736,10 +736,10 @@ event dns_LOC%(c: connection, msg: dns_msg, ans: dns_answer, loc: dns_loc_rr%);
## svcb: The parsed RDATA of SVCB type record. ## svcb: The parsed RDATA of SVCB type record.
event dns_SVCB%(c: connection, msg: dns_msg, ans: dns_answer, svcb: dns_svcb_rr%); event dns_SVCB%(c: connection, msg: dns_msg, ans: dns_answer, svcb: dns_svcb_rr%);
## Generated for DNS replies of type *HTTPS*. ## Generated for DNS replies of type *HTTPS* (HTTPS Specific Service Endpoints).
## See `RFC draft <https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-07>`__ ## See `RFC draft for DNS SVCB/HTTPS <https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-07>`__
## for more information about the DNS SVCB/HTTPS resource records. ## for more information about DNS SVCB/HTTPS resource records.
## Since SVCB and HTTPS record share the same wire format layout, the argument https is dns_svcb_rr. ## Since SVCB and HTTPS records share the same wire format layout, the argument https is dns_svcb_rr.
## For replies with multiple answers, an individual event of the corresponding type is raised for each. ## For replies with multiple answers, an individual event of the corresponding type is raised for each.
## ##
## c: The connection, which may be UDP or TCP depending on the type of the ## c: The connection, which may be UDP or TCP depending on the type of the
@ -749,7 +749,7 @@ event dns_SVCB%(c: connection, msg: dns_msg, ans: dns_answer, svcb: dns_svcb_rr%
## ##
## ans: The type-independent part of the parsed answer record. ## ans: The type-independent part of the parsed answer record.
## ##
## https: The parsed RDATA of SVCB type record. ## https: The parsed RDATA of HTTPS type record.
event dns_HTTPS%(c: connection, msg: dns_msg, ans: dns_answer, https: dns_svcb_rr%); event dns_HTTPS%(c: connection, msg: dns_msg, ans: dns_answer, https: dns_svcb_rr%);
## Generated at the end of processing a DNS packet. This event is the last ## Generated at the end of processing a DNS packet. This event is the last