From: Amos Jeffries Date: Fri, 3 Feb 2023 14:07:53 +0000 (+0000) Subject: Fix stub for ip/libip.la (#1254) X-Git-Tag: SQUID_6_0_1~23 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b709c3768fabff7528dd9b3ce20b02887c19542a;p=thirdparty%2Fsquid.git Fix stub for ip/libip.la (#1254) Use to build disk I/O tests which do not need IP address operations. This also ensures bitrot does not reappear. --- diff --git a/src/Makefile.am b/src/Makefile.am index 5980358c27..dcbb71e35c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1095,6 +1095,7 @@ tests_testRock_SOURCES = \ tests/stub_libeui.cc \ tests/stub_libformat.cc \ tests/stub_libicmp.cc \ + tests/stub_libip.cc \ tests/stub_liblog.cc \ tests/stub_libmgr.cc \ tests/stub_libsecurity.cc \ @@ -1131,7 +1132,6 @@ tests_testRock_LDADD = \ parser/libparser.la \ libsquid.la \ comm/libcomm.la \ - ip/libip.la \ fs/libfs.la \ $(COMMON_LIBS) \ $(REPL_OBJS) \ @@ -1269,6 +1269,7 @@ tests_testUfs_SOURCES = \ tests/stub_libeui.cc \ tests/stub_libformat.cc \ tests/stub_libicmp.cc \ + tests/stub_libip.cc \ tests/stub_liblog.cc \ tests/stub_libsecurity.cc \ log/access_log.h \ @@ -1310,7 +1311,6 @@ tests_testUfs_LDADD = \ acl/libstate.la \ acl/libapi.la \ libsquid.la \ - ip/libip.la \ fs/libfs.la \ mgr/libmgr.la \ $(REPL_OBJS) \ @@ -1323,7 +1323,6 @@ tests_testUfs_LDADD = \ comm/libcomm.la \ dns/libdns.la \ base/libbase.la \ - ip/libip.la \ mem/libmem.la \ store/libstore.la \ $(ADAPTATION_LIBS) \ @@ -1615,6 +1614,7 @@ tests_testDiskIO_SOURCES = \ tests/stub_libeui.cc \ tests/stub_libformat.cc \ tests/stub_libicmp.cc \ + tests/stub_libip.cc \ tests/stub_liblog.cc \ tests/stub_libsecurity.cc \ tests/stub_libstore.cc \ @@ -1659,7 +1659,6 @@ tests_testDiskIO_LDADD = \ acl/libacls.la \ acl/libstate.la \ comm/libcomm.la \ - ip/libip.la \ fs/libfs.la \ ipc/libipc.la \ $(REPL_OBJS) \ diff --git a/src/tests/stub_libip.cc b/src/tests/stub_libip.cc index 5062da3eb8..e95d392f93 100644 --- a/src/tests/stub_libip.cc +++ b/src/tests/stub_libip.cc @@ -12,34 +12,104 @@ #define STUB_API "ip/libip.la" #include "tests/STUB.h" +#include "ip/Address.h" +Ip::Address::Address(const struct in_addr &) STUB +Ip::Address::Address(const struct sockaddr_in &) STUB +Ip::Address::Address(const struct in6_addr &) STUB +Ip::Address::Address(const struct sockaddr_in6 &) STUB +Ip::Address::Address(const struct hostent &) STUB +Ip::Address::Address(const struct addrinfo &) STUB +Ip::Address::Address(const char*) STUB +Ip::Address& Ip::Address::operator =(struct sockaddr_in const &) STUB_RETVAL(*this) +Ip::Address& Ip::Address::operator =(struct sockaddr_storage const &) STUB_RETVAL(*this) +Ip::Address& Ip::Address::operator =(struct in_addr const &) STUB_RETVAL(*this) +Ip::Address& Ip::Address::operator =(struct in6_addr const &) STUB_RETVAL(*this) +Ip::Address& Ip::Address::operator =(struct sockaddr_in6 const &) STUB_RETVAL(*this) +bool Ip::Address::operator =(const struct hostent &) STUB_RETVAL(false) +bool Ip::Address::operator =(const struct addrinfo &) STUB_RETVAL(false) +bool Ip::Address::operator =(const char *) STUB_RETVAL(false) +bool Ip::Address::operator ==(Ip::Address const &) const STUB_RETVAL(false) +bool Ip::Address::operator !=(Ip::Address const &) const STUB_RETVAL(false) +bool Ip::Address::operator >=(Ip::Address const &) const STUB_RETVAL(false) +bool Ip::Address::operator <=(Ip::Address const &) const STUB_RETVAL(false) +bool Ip::Address::operator >(Ip::Address const &) const STUB_RETVAL(false) +bool Ip::Address::operator <(Ip::Address const &) const STUB_RETVAL(false) +bool Ip::Address::isIPv4() const STUB_RETVAL(false) +bool Ip::Address::isIPv6() const STUB_RETVAL(false) +bool Ip::Address::isSockAddr() const STUB_RETVAL(false) +bool Ip::Address::isAnyAddr() const STUB_RETVAL(false) +bool Ip::Address::isNoAddr() const STUB_RETVAL(false) +bool Ip::Address::isLocalhost() const STUB_RETVAL(false) +bool Ip::Address::isSiteLocal6() const STUB_RETVAL(false) +bool Ip::Address::isSiteLocalAuto() const STUB_RETVAL(false) +unsigned short Ip::Address::port() const STUB +unsigned short Ip::Address::port(unsigned short) STUB +void Ip::Address::setAnyAddr() STUB +void Ip::Address::setNoAddr() STUB +void Ip::Address::setLocalhost() STUB +void Ip::Address::setEmpty() STUB_NOP // NOP for default constructor +bool Ip::Address::setIPv4() STUB_RETVAL(false) +int Ip::Address::cidr() const STUB_RETVAL(0) +int Ip::Address::applyMask(const Ip::Address &) STUB_RETVAL(0) +bool Ip::Address::applyMask(const unsigned int, int) STUB_RETVAL(false) +void Ip::Address::applyClientMask(const Ip::Address &) STUB +char* Ip::Address::toStr(char *, const unsigned int, int) const STUB_RETVAL(nullptr) +char* Ip::Address::toUrl(char *, unsigned int) const STUB_RETVAL(nullptr) +unsigned int Ip::Address::toHostStr(char *, const unsigned int) const STUB_RETVAL(0) +bool Ip::Address::fromHost(const char *) STUB_RETVAL(false) +bool Ip::Address::getReverseString(char [], int) const STUB_RETVAL(false) +int Ip::Address::matchIPAddr(const Ip::Address &) const STUB_RETVAL(0) +int Ip::Address::compareWhole(const Ip::Address &) const STUB_RETVAL(0) +void Ip::Address::getAddrInfo(struct addrinfo *&, int) const STUB +void Ip::Address::FreeAddr(struct addrinfo *&) STUB +void Ip::Address::InitAddr(struct addrinfo *&) STUB +bool Ip::Address::GetHostByName(const char *) STUB_RETVAL(false) +void Ip::Address::getSockAddr(struct sockaddr_storage &, const int) const STUB +void Ip::Address::getSockAddr(struct sockaddr_in &) const STUB +bool Ip::Address::getInAddr(struct in_addr &) const STUB_RETVAL(false) +void Ip::Address::getSockAddr(struct sockaddr_in6 &) const STUB +void Ip::Address::getInAddr(struct in6_addr &) const STUB +void parse_IpAddress_list_token(Ip::Address_list **, char *) STUB + +//#include "ip/forward.h" + #include "ip/QosConfig.h" -namespace Ip -{ -namespace Qos -{ -void getTosFromServer(fde *, const int) { -#if USE_QOS_TOS - STUB -#endif -} -void getNfmarkFromServer(const fde *, const fde *, const int) { -#if USE_QOS_NFMARK - STUB -#endif -} -#if USE_QOS_NFMARK -int GetNfMarkCallback(enum nf_conntrack_msg_type, struct nf_conntrack *, void *) STUB_RETVAL(-1) -#endif -tos_t doTosLocalMiss(const int, const hier_code) STUB_RETVAL(-1) -int doNfmarkLocalMiss(const int, const hier_code) STUB_RETVAL(-1) -int doTosLocalHit(const int) STUB_RETVAL(-1) -int doNfmarkLocalHit(const int) STUB_RETVAL(-1) -void parseConfigLine() STUB -void dumpConfigLine(char *, const char *) STUB - -Config::Config() {STUB} -bool Config::isAclNfmarkActive() const STUB_RETVAL(false) -bool Config::isAclTosActive() const STUB_RETVAL(false) -} -} +CBDATA_CLASS_INIT(acl_tos); +acl_tos::~acl_tos() STUB +CBDATA_CLASS_INIT(acl_nfmark); +acl_nfmark::~acl_nfmark() STUB +void Ip::Qos::getTosFromServer(const Comm::ConnectionPointer &, fde *) STUB +nfmark_t Ip::Qos::getNfConnmark(const Comm::ConnectionPointer &, const ConnectionDirection) STUB_RETVAL(-1) +bool Ip::Qos::setNfConnmark(Comm::ConnectionPointer &, const ConnectionDirection, const Ip::NfMarkConfig &) STUB_RETVAL(false) +int Ip::Qos::doTosLocalMiss(const Comm::ConnectionPointer &, const hier_code) STUB_RETVAL(-1) +int Ip::Qos::doNfmarkLocalMiss(const Comm::ConnectionPointer &, const hier_code) STUB_RETVAL(-1) +int Ip::Qos::doTosLocalHit(const Comm::ConnectionPointer &) STUB_RETVAL(-1) +int Ip::Qos::doNfmarkLocalHit(const Comm::ConnectionPointer &) STUB_RETVAL(-1) +int Ip::Qos::setSockTos(const Comm::ConnectionPointer &, tos_t) STUB_RETVAL(-1) +int Ip::Qos::setSockTos(const int, tos_t, int) STUB_RETVAL(-1) +int Ip::Qos::setSockNfmark(const Comm::ConnectionPointer &, nfmark_t) STUB_RETVAL(-1) +int Ip::Qos::setSockNfmark(const int, nfmark_t) STUB_RETVAL(-1) +Ip::Qos::Config::Config() STUB_NOP +void Ip::Qos::Config::parseConfigLine() STUB +void Ip::Qos::Config::dumpConfigLine(char *, const char *) const STUB +bool Ip::Qos::Config::isAclNfmarkActive() const STUB_RETVAL(false) +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 +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) + +#include "ip/tools.h" +void Ip::ProbeTransport() STUB +int Ip::EnableIpv6 = 0;