From ffab82673fdf7953a10e922d79b4432366a83442 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Thu, 13 Apr 2023 07:03:53 +0000 Subject: [PATCH] Adapt ip/libip.la stub to v5 The changes in commit 6ab5d388ae8cffc4ac0e99b0bfac4f0c6356e81f (PR#1254) are targeting code post commit 96f97829e13 (PR#1062) which will not be backported to v5. Adapting the stub file to the v5 methods signature. --- src/tests/stub_libip.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/tests/stub_libip.cc b/src/tests/stub_libip.cc index 0616767dda..220ea77568 100644 --- a/src/tests/stub_libip.cc +++ b/src/tests/stub_libip.cc @@ -97,17 +97,15 @@ bool Ip::Qos::Config::isAclTosActive() const STUB_RETVAL(false) Ip::Qos::Config Ip::Qos::TheConfig; #include "ip/Intercept.h" -bool Ip::Intercept::LookupNat(const Comm::Connection &) STUB_RETVAL(false) bool Ip::Intercept::ProbeForTproxy(Ip::Address &) STUB_RETVAL(false) -void Ip::Intercept::StartTransparency() STUB void Ip::Intercept::StopTransparency(const char *) STUB -void Ip::Intercept::StartInterception() STUB +bool Ip::Intercept::Lookup(const Comm::ConnectionPointer &newConn, const Comm::ConnectionPointer &listenConn) STUB_RETVAL(false) Ip::Intercept Ip::Interceptor; #include "ip/NfMarkConfig.h" Ip::NfMarkConfig Ip::NfMarkConfig::Parse(const SBuf &) STUB_RETSTATREF(Ip::NfMarkConfig) nfmark_t Ip::NfMarkConfig::applyToMark(nfmark_t) const STUB_RETVAL(0) -std::ostream &Ip::operator <<(std::ostream &os, Ip::NfMarkConfig) STUB_RETVAL(os) +std::ostream &operator <<(std::ostream &os, Ip::NfMarkConfig) STUB_RETVAL(os) #include "ip/tools.h" void Ip::ProbeTransport() STUB -- 2.47.2