Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-10 02:28:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Remove all of the random single-file deprecations

Browse source 
These are the changes that don't require a ton of changes to other files outside
of the original removal.
This commit is contained in:
Tim Wojtulewicz 2021-01-21 11:49:36 -07:00
parent 7e9d89db0a
commit 0618be792f
270 changed files with 36 additions and 4632 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/iosource/BPF_Program.h
View file

@ -57,5 +57,3 @@ protected:
};
} // namespace zeek::iosource::detail
using BPF_Program [[deprecated("Remove in v4.1. Use zeek::iosource::detail::BPF_Program.")]] = zeek::iosource::detail::BPF_Program;

8
src/iosource/Component.h
View file

@ -168,11 +168,3 @@ private:
};
} // namespace zeek::iosource
namespace iosource {
using Component [[deprecated("Remove in v4.1. Use zeek::iosource::Component.")]] = zeek::iosource::Component;
using PktSrcComponent [[deprecated("Remove in v4.1. Use zeek::iosource::PktSrcComponent.")]] = zeek::iosource::PktSrcComponent;
using PktDumperComponent [[deprecated("Remove in v4.1. Use zeek::iosource::PktDumperComponent.")]] = zeek::iosource::PktDumperComponent;
} // namespace iosource

6
src/iosource/IOSource.h
View file

@ -87,9 +87,3 @@ private:
};
} // namespace zeek::iosource
namespace iosource {
using IOSource [[deprecated("Remove in v4.1. Use zeek::iosource::IOSource.")]] = zeek::iosource::IOSource;
} // namespace iosource

8
src/iosource/Manager.h
View file

@ -215,11 +215,3 @@ private:
extern iosource::Manager* iosource_mgr;
} // namespace zeek
extern zeek::iosource::Manager*& iosource_mgr [[deprecated("Remove in v4.1. Use zeek::iosource_mgr.")]];
namespace iosource {
using Manager [[deprecated("Remove in v4.1. Use zeek::iosource::Manager.")]] = zeek::iosource::Manager;
} // namespace iosource

5
src/iosource/Packet.cc
View file

@ -146,11 +146,6 @@ RecordValPtr Packet::ToRawPktHdrVal() const
return pkt_hdr;
}
RecordVal* Packet::BuildPktHdrVal() const
{
return ToRawPktHdrVal().release();
}
ValPtr Packet::FmtEUI48(const u_char* mac) const
{
char buf[20];

11
src/iosource/Packet.h
View file

@ -121,9 +121,6 @@ public:
*/
RecordValPtr ToRawPktHdrVal() const;
[[deprecated("Remove in v4.1. Use ToRawPktHdrval() instead.")]]
RecordVal* BuildPktHdrVal() const;
/**
* Maximal length of a layer 2 address.
*/
@ -246,11 +243,3 @@ private:
};
} // namespace zeek
using Layer3Proto [[deprecated("Remove in v4.1. Use zeek::Layer3Proto.")]] = zeek::Layer3Proto;
using Packet [[deprecated("Remove in v4.1. Use zeek::Packet.")]] = zeek::Packet;
constexpr auto L3_UNKNOWN [[deprecated("Remove in v4.1. Use zeek::L3_UNKNOWN")]] = zeek::L3_UNKNOWN;
constexpr auto L3_IPV4 [[deprecated("Remove in v4.1. Use zeek::L3_IPV4")]] = zeek::L3_IPV4;
constexpr auto L3_IPV6 [[deprecated("Remove in v4.1. Use zeek::L3_IPV6")]] = zeek::L3_IPV6;
constexpr auto L3_ARP [[deprecated("Remove in v4.1. Use zeek::L3_ARP")]] = zeek::L3_ARP;

6
src/iosource/PktDumper.h
View file

@ -134,9 +134,3 @@ private:
};
} // namespace zeek::iosource
namespace iosource {
using PktDumper [[deprecated("Remove in v4.1. Use zeek::iosource::PktDumper.")]] = zeek::iosource::PktDumper;
} // namespace iosource

10
src/iosource/PktSrc.cc
View file

@ -70,16 +70,6 @@ bool PktSrc::IsLive() const
return props.is_live;
}
double PktSrc::CurrentPacketTimestamp()
{
return run_state::current_packet_timestamp();
}
double PktSrc::CurrentPacketWallClock()
{
return run_state::current_packet_wallclock();
}
void PktSrc::Opened(const Properties& arg_props)
{
props = arg_props;

21
src/iosource/PktSrc.h
View file

@ -91,21 +91,6 @@ public:
*/
const char* ErrorMsg() const;
/**
* In pseudo-realtime mode, returns the logical timestamp of the
* current packet. Undefined if not running pseudo-realtime mode.
*/
[[deprecated("Remove in v4.1. Use zeek::run_state::current_packet_timestamp().")]]
double CurrentPacketTimestamp();
/**
* In pseudo-realtime mode, returns the wall clock time associated
* with current packet. Undefined if not running pseudo-realtime
* mode.
*/
[[deprecated("Remove in v4.1. Use zeek::run_state::current_wallclock().")]]
double CurrentPacketWallClock();
/**
* Precompiles a BPF filter and associates the given index with it.
* The compiled filter will be then available via \a GetBPFFilter().
@ -366,9 +351,3 @@ private:
};
} // namespace zeek::iosource
namespace iosource {
using PktSrc [[deprecated("Remove in v4.1. Use zeek::iosource::PktSrc.")]] = zeek::iosource::PktSrc;
} // namespace iosource

6
src/iosource/pcap/Dumper.h
View file

@ -32,9 +32,3 @@ private:
};
} // namespace zeek::iosource::pcap
namespace iosource::pcap {
using PcapDumper [[deprecated("Remove in v4.1. Use zeek::iosource::pcap::PcapDumper.")]] = zeek::iosource::pcap::PcapDumper;
} // namespace iosource::pcap

6
src/iosource/pcap/Source.h
View file

@ -41,9 +41,3 @@ private:
};
} // namespace zeek::iosource::pcap
namespace iosource::pcap {
using PcapSource [[deprecated("Remove in v4.1. Use zeek::iosource::pcap::PcapSource.")]] = zeek::iosource::pcap::PcapSource;
} // namespace iosource::pcap