aboutsummaryrefslogtreecommitdiffstats
path: root/util/network
diff options
context:
space:
mode:
authoragorodilov <agorodilov@yandex-team.ru>2022-02-10 16:47:09 +0300
committerDaniil Cherednik <dcherednik@yandex-team.ru>2022-02-10 16:47:09 +0300
commitbd5ef432f5cfb1e18851381329d94665a4c22470 (patch)
treeb83306b6e37edeea782e9eed673d89286c4fef35 /util/network
parent7a4979e6211c3e78c7f9041d4a9e5d3405343c36 (diff)
downloadydb-bd5ef432f5cfb1e18851381329d94665a4c22470.tar.gz
Restoring authorship annotation for <agorodilov@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'util/network')
-rw-r--r--util/network/address.h18
-rw-r--r--util/network/poller.cpp2
-rw-r--r--util/network/sock.h34
-rw-r--r--util/network/socket.cpp16
-rw-r--r--util/network/socket.h10
5 files changed, 40 insertions, 40 deletions
diff --git a/util/network/address.h b/util/network/address.h
index e85c495510..448fcac0c9 100644
--- a/util/network/address.h
+++ b/util/network/address.h
@@ -9,7 +9,7 @@
namespace NAddr {
class IRemoteAddr {
public:
- virtual ~IRemoteAddr() = default;
+ virtual ~IRemoteAddr() = default;
virtual const sockaddr* Addr() const = 0;
virtual socklen_t Len() const = 0;
@@ -47,11 +47,11 @@ namespace NAddr {
Assign(addr, SockAddrLength(addr));
}
- const sockaddr* Addr() const override {
+ const sockaddr* Addr() const override {
return MutableAddr();
}
- socklen_t Len() const override {
+ socklen_t Len() const override {
return L_;
}
@@ -82,11 +82,11 @@ namespace NAddr {
{
}
- const sockaddr* Addr() const override {
+ const sockaddr* Addr() const override {
return AI_->ai_addr;
}
- socklen_t Len() const override {
+ socklen_t Len() const override {
return (socklen_t)AI_->ai_addrlen;
}
@@ -102,11 +102,11 @@ namespace NAddr {
{
}
- const sockaddr* Addr() const override {
+ const sockaddr* Addr() const override {
return A_;
}
- socklen_t Len() const override {
+ socklen_t Len() const override {
return A_;
}
@@ -122,11 +122,11 @@ namespace NAddr {
{
}
- const sockaddr* Addr() const override {
+ const sockaddr* Addr() const override {
return (sockaddr*)&A_;
}
- socklen_t Len() const override {
+ socklen_t Len() const override {
return sizeof(A_);
}
diff --git a/util/network/poller.cpp b/util/network/poller.cpp
index 628f0f0fe0..7954d0e8b5 100644
--- a/util/network/poller.cpp
+++ b/util/network/poller.cpp
@@ -39,7 +39,7 @@ TSocketPoller::TSocketPoller()
{
}
-TSocketPoller::~TSocketPoller() = default;
+TSocketPoller::~TSocketPoller() = default;
void TSocketPoller::WaitRead(SOCKET sock, void* cookie) {
Impl_->Set(cookie, sock, CONT_POLL_READ);
diff --git a/util/network/sock.h b/util/network/sock.h
index 8a2a1c5686..b10be2f715 100644
--- a/util/network/sock.h
+++ b/util/network/sock.h
@@ -152,11 +152,11 @@ struct TSockAddrLocal: public sockaddr_un, public ISockAddr {
Set(path);
}
- socklen_t Size() const override {
+ socklen_t Size() const override {
return sizeof(sockaddr_un);
}
- socklen_t Len() const override {
+ socklen_t Len() const override {
return strlen(sun_path) + 2;
}
@@ -170,11 +170,11 @@ struct TSockAddrLocal: public sockaddr_un, public ISockAddr {
strlcpy(sun_path, path, sizeof(sun_path));
}
- sockaddr* SockAddr() override {
+ sockaddr* SockAddr() override {
return (struct sockaddr*)(struct sockaddr_un*)this;
}
- const sockaddr* SockAddr() const override {
+ const sockaddr* SockAddr() const override {
return (const struct sockaddr*)(const struct sockaddr_un*)this;
}
@@ -186,7 +186,7 @@ struct TSockAddrLocal: public sockaddr_un, public ISockAddr {
return TFsPath(sun_path);
}
- int Bind(SOCKET s, ui16 mode) const override {
+ int Bind(SOCKET s, ui16 mode) const override {
(void)unlink(sun_path);
int ret = bind(s, SockAddr(), Len());
@@ -214,11 +214,11 @@ struct TSockAddrInet: public sockaddr_in, public ISockAddr {
Set(IpFromString(ip), port);
}
- socklen_t Size() const override {
+ socklen_t Size() const override {
return sizeof(sockaddr_in);
}
- socklen_t Len() const override {
+ socklen_t Len() const override {
return Size();
}
@@ -233,11 +233,11 @@ struct TSockAddrInet: public sockaddr_in, public ISockAddr {
sin_port = HostToInet(port);
}
- sockaddr* SockAddr() override {
+ sockaddr* SockAddr() override {
return (struct sockaddr*)(struct sockaddr_in*)this;
}
- const sockaddr* SockAddr() const override {
+ const sockaddr* SockAddr() const override {
return (const struct sockaddr*)(const struct sockaddr_in*)this;
}
@@ -245,7 +245,7 @@ struct TSockAddrInet: public sockaddr_in, public ISockAddr {
return IpToString(sin_addr.s_addr) + ":" + ::ToString(InetToHost(sin_port));
}
- int Bind(SOCKET s, ui16 mode) const override {
+ int Bind(SOCKET s, ui16 mode) const override {
Y_UNUSED(mode);
int ret = bind(s, SockAddr(), Len());
if (ret < 0)
@@ -280,11 +280,11 @@ struct TSockAddrInet6: public sockaddr_in6, public ISockAddr {
Set(ip6, port);
}
- socklen_t Size() const override {
+ socklen_t Size() const override {
return sizeof(sockaddr_in6);
}
- socklen_t Len() const override {
+ socklen_t Len() const override {
return Size();
}
@@ -299,11 +299,11 @@ struct TSockAddrInet6: public sockaddr_in6, public ISockAddr {
sin6_port = HostToInet(port);
}
- sockaddr* SockAddr() override {
+ sockaddr* SockAddr() override {
return (struct sockaddr*)(struct sockaddr_in6*)this;
}
- const sockaddr* SockAddr() const override {
+ const sockaddr* SockAddr() const override {
return (const struct sockaddr*)(const struct sockaddr_in6*)this;
}
@@ -311,7 +311,7 @@ struct TSockAddrInet6: public sockaddr_in6, public ISockAddr {
return "[" + GetIp() + "]:" + ::ToString(InetToHost(sin6_port));
}
- int Bind(SOCKET s, ui16 mode) const override {
+ int Bind(SOCKET s, ui16 mode) const override {
Y_UNUSED(mode);
int ret = bind(s, SockAddr(), Len());
if (ret < 0) {
@@ -561,7 +561,7 @@ public:
protected:
TStreamSocket* Socket;
- size_t DoRead(void* buf, size_t len) override {
+ size_t DoRead(void* buf, size_t len) override {
Y_VERIFY(Socket, "TStreamSocketInput: socket isn't set");
const ssize_t ret = Socket->Recv(buf, len);
@@ -589,7 +589,7 @@ public:
protected:
TStreamSocket* Socket;
- void DoWrite(const void* buf, size_t len) override {
+ void DoWrite(const void* buf, size_t len) override {
Y_VERIFY(Socket, "TStreamSocketOutput: socket isn't set");
const char* ptr = (const char*)buf;
diff --git a/util/network/socket.cpp b/util/network/socket.cpp
index 9b53e883a2..4f6e804346 100644
--- a/util/network/socket.cpp
+++ b/util/network/socket.cpp
@@ -583,7 +583,7 @@ public:
{
}
- inline ~TImpl() = default;
+ inline ~TImpl() = default;
inline SOCKET Fd() const noexcept {
return Fd_;
@@ -755,9 +755,9 @@ public:
inline TCommonSockOps() noexcept {
}
- ~TCommonSockOps() override = default;
+ ~TCommonSockOps() override = default;
- ssize_t Send(SOCKET fd, const void* data, size_t len) override {
+ ssize_t Send(SOCKET fd, const void* data, size_t len) override {
ssize_t ret = -1;
do {
ret = send(fd, (const char*)data, (int)len, MSG_NOSIGNAL);
@@ -770,7 +770,7 @@ public:
return ret;
}
- ssize_t Recv(SOCKET fd, void* buf, size_t len) override {
+ ssize_t Recv(SOCKET fd, void* buf, size_t len) override {
ssize_t ret = -1;
do {
ret = recv(fd, (char*)buf, (int)len, 0);
@@ -783,7 +783,7 @@ public:
return ret;
}
- ssize_t SendV(SOCKET fd, const TPart* parts, size_t count) override {
+ ssize_t SendV(SOCKET fd, const TPart* parts, size_t count) override {
ssize_t ret = SendVImpl(fd, parts, count);
if (ret < 0) {
@@ -866,7 +866,7 @@ TSocket::TSocket(const TNetworkAddress& addr, const TInstant& deadLine)
{
}
-TSocket::~TSocket() = default;
+TSocket::~TSocket() = default;
SOCKET TSocket::Fd() const noexcept {
return Impl_->Fd();
@@ -893,7 +893,7 @@ TSocketInput::TSocketInput(const TSocket& s) noexcept
{
}
-TSocketInput::~TSocketInput() = default;
+TSocketInput::~TSocketInput() = default;
size_t TSocketInput::DoRead(void* buf, size_t len) {
const ssize_t ret = S_.Recv(buf, len);
@@ -1084,7 +1084,7 @@ TNetworkAddress::TNetworkAddress(ui16 port)
{
}
-TNetworkAddress::~TNetworkAddress() = default;
+TNetworkAddress::~TNetworkAddress() = default;
struct addrinfo* TNetworkAddress::Info() const noexcept {
return Impl_->Info();
diff --git a/util/network/socket.h b/util/network/socket.h
index 521b55a8ee..40c8648b40 100644
--- a/util/network/socket.h
+++ b/util/network/socket.h
@@ -301,8 +301,8 @@ public:
class TOps {
public:
- inline TOps() noexcept = default;
- virtual ~TOps() = default;
+ inline TOps() noexcept = default;
+ virtual ~TOps() = default;
virtual ssize_t Send(SOCKET fd, const void* data, size_t len) = 0;
virtual ssize_t Recv(SOCKET fd, void* buf, size_t len) = 0;
@@ -402,7 +402,7 @@ public:
}
private:
- size_t DoRead(void* buf, size_t len) override;
+ size_t DoRead(void* buf, size_t len) override;
private:
TSocket S_;
@@ -421,8 +421,8 @@ public:
}
private:
- void DoWrite(const void* buf, size_t len) override;
- void DoWriteV(const TPart* parts, size_t count) override;
+ void DoWrite(const void* buf, size_t len) override;
+ void DoWriteV(const TPart* parts, size_t count) override;
private:
TSocket S_;