From 88ffe060048409a92817b876d67e8e1c02e6a24c Mon Sep 17 00:00:00 2001 From: Jon Siwek Date: Thu, 27 Jun 2019 16:17:36 -0700 Subject: [PATCH] Un-deprecate anonymizer BIFs --- scripts/base/init-bare.zeek | 4 ---- src/event.bif | 2 +- src/zeek.bif | 3 ++- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/scripts/base/init-bare.zeek b/scripts/base/init-bare.zeek index 23bb5897ef..e63c08d7df 100644 --- a/scripts/base/init-bare.zeek +++ b/scripts/base/init-bare.zeek @@ -755,8 +755,6 @@ global restrict_filters: table[string] of string &redef; ## :zeek:see:`Pcap::precompile_pcap_filter` and :zeek:see:`Pcap::precompile_pcap_filter`. type PcapFilterID: enum { None }; -## Deprecated. -## ## .. zeek:see:: anonymize_addr type IPAddrAnonymization: enum { KEEP_ORIG_ADDR, @@ -766,8 +764,6 @@ type IPAddrAnonymization: enum { PREFIX_PRESERVING_MD5, }; -## Deprecated. -## ## .. zeek:see:: anonymize_addr type IPAddrAnonymizationClass: enum { ORIG_ADDR, diff --git a/src/event.bif b/src/event.bif index 92f3532ef0..d5017804be 100644 --- a/src/event.bif +++ b/src/event.bif @@ -864,7 +864,7 @@ event kazaa_signature_found%(c: connection%); ## Deprecated. Will be removed. event gaobot_signature_found%(c: connection%); -## Deprecated. Will be removed. +## Shows an IP address anonymization mapping. event anonymization_mapping%(orig: addr, mapped: addr%); ## Deprecated. Will be removed. diff --git a/src/zeek.bif b/src/zeek.bif index be6224d6b7..dac9f09bad 100644 --- a/src/zeek.bif +++ b/src/zeek.bif @@ -5017,7 +5017,8 @@ function match_signatures%(c: connection, pattern_type: int, s: string, # =========================================================================== # -# Deprecated Functions +# Anonymization Functions +# (Not Fully Functional) # # ===========================================================================