-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
net/SocketAddress: move code to IsInet()
- Loading branch information
1 parent
18060b0
commit 016b8bf
Showing
3 changed files
with
16 additions
and
12 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,7 @@ | ||
// SPDX-License-Identifier: BSD-2-Clause | ||
// author: Max Kellermann <[email protected]> | ||
|
||
#ifndef ALLOCATED_SOCKET_ADDRESS_HXX | ||
#define ALLOCATED_SOCKET_ADDRESS_HXX | ||
#pragma once | ||
|
||
#include "SocketAddress.hxx" // IWYU pragma: export | ||
#include "Features.hxx" | ||
|
@@ -117,6 +116,10 @@ public: | |
size = 0; | ||
} | ||
|
||
bool IsInet() const noexcept { | ||
return GetFamily() == AF_INET || GetFamily() == AF_INET6; | ||
} | ||
|
||
#ifdef HAVE_UN | ||
/** | ||
* @see SocketAddress::GetLocalRaw() | ||
|
@@ -191,5 +194,3 @@ public: | |
private: | ||
void SetSize(size_type new_size) noexcept; | ||
}; | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,7 @@ | ||
// SPDX-License-Identifier: BSD-2-Clause | ||
// author: Max Kellermann <[email protected]> | ||
|
||
#ifndef SOCKET_ADDRESS_HXX | ||
#define SOCKET_ADDRESS_HXX | ||
#pragma once | ||
|
||
#include "Features.hxx" | ||
|
||
|
@@ -95,6 +94,10 @@ public: | |
return GetFamily() != AF_UNSPEC; | ||
} | ||
|
||
constexpr bool IsInet() const noexcept { | ||
return GetFamily() == AF_INET || GetFamily() == AF_INET6; | ||
} | ||
|
||
#ifdef HAVE_UN | ||
/** | ||
* Extract the local socket path (which may begin with a null | ||
|
@@ -135,10 +138,8 @@ public: | |
/** | ||
* Does the address family support port numbers? | ||
*/ | ||
[[gnu::pure]] | ||
bool HasPort() const noexcept { | ||
return !IsNull() && | ||
(GetFamily() == AF_INET || GetFamily() == AF_INET6); | ||
constexpr bool HasPort() const noexcept { | ||
return !IsNull() && IsInet(); | ||
} | ||
|
||
/** | ||
|
@@ -173,5 +174,3 @@ public: | |
return !(*this == other); | ||
} | ||
}; | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters