generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-10 16:37:45 +01:00
Code Issues Projects Releases Wiki Activity

Problem: protected data members in ip_address_t, ip_address_mask_t violates LSP

Browse Source 
Solution: make ip_address_mask_t independent of ip_address_t, they do not share that much, remove some code duplication between ip_address_t and ip_addr_t
This commit is contained in:
Simon Giesecke
2018-05-30 10:28:14 +02:00
parent 314ac28dbd
commit 273137741a
2 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/tcp_address.hpp
View File

@@ -44,7 +44,6 @@ class tcp_address_t
public:
tcp_address_t ();
tcp_address_t (const sockaddr *sa_, socklen_t sa_len_);
virtual ~tcp_address_t ();
// This function translates textual TCP address into an address
// structure. If 'local' is true, names are resolved as local interface
@@ -53,7 +52,7 @@ class tcp_address_t
int resolve (const char *name_, bool local_, bool ipv6_);
// The opposite to resolve()
virtual int to_string (std::string &addr_);
int to_string (std::string &addr_) const;
#if defined ZMQ_HAVE_WINDOWS
unsigned short family () const;
@@ -67,13 +66,13 @@ class tcp_address_t
socklen_t src_addrlen () const;
bool has_src_addr () const;
protected:
private:
ip_addr_t _address;
ip_addr_t _source_address;
bool _has_src_addr;
};
class tcp_address_mask_t : public tcp_address_t
class tcp_address_mask_t
{
public:
tcp_address_mask_t ();
@@ -84,7 +83,7 @@ class tcp_address_mask_t : public tcp_address_t
int resolve (const char *name_, bool ipv6_);
// The opposite to resolve()
int to_string (std::string &addr_);
int to_string (std::string &addr_) const;
int mask () const;
@@ -92,6 +91,7 @@ class tcp_address_mask_t : public tcp_address_t
const socklen_t ss_len_) const;
private:
ip_addr_t _network_address;
int _address_mask;
};
}