diff --git a/NEWS b/NEWS index af8523e02d..3f987ee7aa 100644 --- a/NEWS +++ b/NEWS @@ -410,6 +410,7 @@ Removed Functionality - ``peer_id`` - ``event_peer`` + - ``packet`` - The following configuration options were deprecated in version 2.6 or below and are removed from this release: diff --git a/scripts/base/init-bare.zeek b/scripts/base/init-bare.zeek index e63c08d7df..a69f681f1f 100644 --- a/scripts/base/init-bare.zeek +++ b/scripts/base/init-bare.zeek @@ -644,17 +644,6 @@ type ReporterStats: record { weirds_by_type: table[string] of count; }; -## Deprecated. -## -## .. todo:: Remove. It's still declared internally but doesn't seem used anywhere -## else. -type packet: record { - conn: connection; - is_orig: bool; - seq: count; ##< seq=k => it is the kth *packet* of the connection - timestamp: time; -}; - ## Table type used to map variable names to their memory allocation. ## ## .. zeek:see:: global_sizes diff --git a/src/NetVar.cc b/src/NetVar.cc index 6c59f2a5fa..1ab9b6bcb6 100644 --- a/src/NetVar.cc +++ b/src/NetVar.cc @@ -145,8 +145,6 @@ double table_expire_interval; double table_expire_delay; int table_incremental_step; -RecordType* packet_type; - double connection_status_update_interval; int orig_addr_anonymization, resp_addr_anonymization; @@ -413,8 +411,6 @@ void init_net_var() software = internal_type("software")->AsRecordType(); software_version = internal_type("software_version")->AsRecordType(); - packet_type = internal_type("packet")->AsRecordType(); - orig_addr_anonymization = opt_internal_int("orig_addr_anonymization"); resp_addr_anonymization = opt_internal_int("resp_addr_anonymization"); other_addr_anonymization = opt_internal_int("other_addr_anonymization"); diff --git a/src/NetVar.h b/src/NetVar.h index 3c9d92eb4d..4d91514006 100644 --- a/src/NetVar.h +++ b/src/NetVar.h @@ -148,8 +148,6 @@ extern double table_expire_interval; extern double table_expire_delay; extern int table_incremental_step; -extern RecordType* packet_type; - extern int orig_addr_anonymization, resp_addr_anonymization; extern int other_addr_anonymization; extern TableVal* preserve_orig_addr;