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

remove data+=option_len error in cookie and keepalive

Browse source
This commit is contained in:
FlyingWithJerome 2020-08-16 09:27:01 -04:00
parent 74efbd0abc
commit d75a385f8f
3 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3700,20 +3700,20 @@ type dns_edns_ecs: record {
address: string; ##< Client Subnet Address. address: string; ##< Client Subnet Address.
}; };
## An DNS EDNS TCP Keepalive (TCP_KA) record. ## An DNS EDNS TCP KEEPALIVE (TCP KEEPALIVE) record.
## ##
## .. zeek:see:: dns_EDNS_tcp_keepalive ## .. zeek:see:: dns_EDNS_tcp_keepalive
type dns_edns_tcp_keepalive: record { type dns_edns_tcp_keepalive: record {
keepalive_timeout_omitted: bool; ##< Whether timeout value is omitted keepalive_timeout_omitted: bool; ##< Whether timeout value is omitted.
keepalive_timeout: count; ##< Timeout value, in 100ms keepalive_timeout: count; ##< Timeout value, in 100ms.
}; };
## An DNS EDNS COOKIE (COOKIE) record. ## An DNS EDNS COOKIE (COOKIE) record.
## ##
## .. zeek:see:: dns_EDNS_tcp_keepalive ## .. zeek:see:: dns_EDNS_cookie
type dns_edns_cookie: record { type dns_edns_cookie: record {
client_cookie: string; ##< Cookie from the client (fixed 8 bytes) client_cookie: string; ##< Cookie from the client (fixed 8 bytes).
server_cookie: string &default=""; ##< Cookie from the server (8 to 32 bytes) server_cookie: string &default=""; ##< Cookie from the server (8 to 32 bytes).
}; };
## An additional DNS TSIG record. ## An additional DNS TSIG record.

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

@ -816,7 +816,6 @@ bool DNS_Interpreter::ParseRR_EDNS(DNS_MsgInfo* msg,
{ {
// error. MUST BE 0 or 2 bytes // error. MUST BE 0 or 2 bytes
} }
data += option_len;
break; break;
} // END EDNS TCP KEEPALIVE } // END EDNS TCP KEEPALIVE
@ -850,7 +849,6 @@ bool DNS_Interpreter::ParseRR_EDNS(DNS_MsgInfo* msg,
msg->BuildEDNS_COOKIE_Val(&cookie) msg->BuildEDNS_COOKIE_Val(&cookie)
); );
data += option_len;
break; break;
} // END EDNS COOKIE } // END EDNS COOKIE

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

@ -540,7 +540,7 @@ event dns_EDNS_ecs%(c: connection, msg: dns_msg, opt: dns_edns_ecs%);
## ##
## msg: The parsed DNS message header. ## msg: The parsed DNS message header.
## ##
## opt: The parsed EDNS option. ## opt: The parsed EDNS Keepalive option.
## ##
## .. zeek:see:: dns_AAAA_reply dns_A_reply dns_CNAME_reply dns_HINFO_reply dns_MX_reply ## .. zeek:see:: dns_AAAA_reply dns_A_reply dns_CNAME_reply dns_HINFO_reply dns_MX_reply
## dns_NS_reply dns_PTR_reply dns_SOA_reply dns_SRV_reply dns_TSIG_addl ## dns_NS_reply dns_PTR_reply dns_SOA_reply dns_SRV_reply dns_TSIG_addl
@ -563,7 +563,7 @@ event dns_EDNS_tcp_keepalive%(c: connection, msg: dns_msg, opt: dns_edns_tcp_kee
## ##
## msg: The parsed DNS message header. ## msg: The parsed DNS message header.
## ##
## opt: The parsed EDNS option. ## opt: The parsed EDNS Cookie option.
## ##
## .. zeek:see:: dns_AAAA_reply dns_A_reply dns_CNAME_reply dns_HINFO_reply dns_MX_reply ## .. zeek:see:: dns_AAAA_reply dns_A_reply dns_CNAME_reply dns_HINFO_reply dns_MX_reply
## dns_NS_reply dns_PTR_reply dns_SOA_reply dns_SRV_reply dns_TSIG_addl ## dns_NS_reply dns_PTR_reply dns_SOA_reply dns_SRV_reply dns_TSIG_addl