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/johanna/gh-446-rfb'

Browse source 
* origin/topic/johanna/gh-446-rfb:
  Deprecate rfb_event.
This commit is contained in:
Jon Siwek 2019-07-03 09:32:34 -07:00
commit c5c688054c
6 changed files with 9 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.6-565 | 2019-07-03 09:32:34 -0700
* GH-446: Deprecate rfb_event. (Johanna Amann, Corelight)
2.6-563 | 2019-07-03 01:57:40 -0700 2.6-563 | 2019-07-03 01:57:40 -0700
* Fix CIF integration and add logging options to intel.log and added comments to code (sfinlon) * Fix CIF integration and add logging options to intel.log and added comments to code (sfinlon)

2
VERSION
View file

@ -1 +1 @@
2.6-563 2.6-565

2
doc

@ -1 +1 @@
Subproject commit d08f22cdf179f4dfd7a49076e384a794a0d51a57 Subproject commit be223b7e2fe9e2cfcfe8df4d594a6255276c6317

5
scripts/base/protocols/rfb/main.zeek
View file

@ -106,11 +106,6 @@ function set_session(c: connection)
} }
} }
event rfb_event(c: connection) &priority=5
{
set_session(c);
}
event rfb_client_version(c: connection, major_version: string, minor_version: string) &priority=5 event rfb_client_version(c: connection, major_version: string, minor_version: string) &priority=5
{ {
set_session(c); set_session(c);

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

@ -1,7 +1,7 @@
## Generated for RFB event ## Generated for RFB event
## ##
## c: The connection record for the underlying transport-layer session/flow. ## c: The connection record for the underlying transport-layer session/flow.
event rfb_event%(c: connection%); event rfb_event%(c: connection%) &deprecated="Remove in v3.1: This event never served a real purpose and will be removed. Please use the other rfb events instead.";
## Generated for RFB event authentication mechanism selection ## Generated for RFB event authentication mechanism selection
## ##
@ -47,4 +47,4 @@ event rfb_server_version%(c: connection, major_version: string, minor_version: s
## width: width of the shared screen ## width: width of the shared screen
## ##
## height: height of the shared screen ## height: height of the shared screen
event rfb_server_parameters%(c: connection, name: string, width: count, height: count%); event rfb_server_parameters%(c: connection, name: string, width: count, height: count%);

2
testing/external/commit-hash.zeek-testing vendored
View file

@ -1 +1 @@
3db517fc4e1cfb1f0050b65eee4fd1b61ba5a461 84239d2fdd2f491f436f8597e8b6ca5fb93f7a5f