Relintai/rcpp_framework
1
0
Fork 0
mirror of https://github.com/Relintai/rcpp_framework.git synced 2025-05-06 17:51:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Moved socket from trantor to core.

Browse Source
This commit is contained in:
Relintai 2022-02-09 23:21:11 +01:00
parent 1fbf6a22c1
commit 0e6ad2d135
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
web_backends/drogon/trantor/net/inner/Socket.cc → core/net/socket.cpp
View File

@ -12,10 +12,9 @@
* *
*/ */
#include "Socket.h" #include "socket.h"
#include <assert.h> #include <assert.h>
#include <sys/types.h> #include <sys/types.h>
#include <trantor/utils/Logger.h>
#ifdef _WIN32 #ifdef _WIN32
#include <ws2tcpip.h> #include <ws2tcpip.h>
#else #else
@ -56,7 +55,7 @@ void Socket::bindAddress(const InetAddress &localaddr) {
if (ret == 0) if (ret == 0)
return; return;
else { else {
LOG_SYSERR << ", Bind address failed at " << localaddr.toIpPort(); //LOG_SYSERR << ", Bind address failed at " << localaddr.toIpPort();
exit(1); exit(1);
} }
} }
@ -64,7 +63,7 @@ void Socket::listen() {
assert(sockFd_ > 0); assert(sockFd_ > 0);
int ret = ::listen(sockFd_, SOMAXCONN); int ret = ::listen(sockFd_, SOMAXCONN);
if (ret < 0) { if (ret < 0) {
LOG_SYSERR << "listen failed"; //LOG_SYSERR << "listen failed";
exit(1); exit(1);
} }
} }
@ -94,7 +93,7 @@ void Socket::closeWrite() {
if (::shutdown(sockFd_, SD_SEND) < 0) if (::shutdown(sockFd_, SD_SEND) < 0)
#endif #endif
{ {
LOG_SYSERR << "sockets::shutdownWrite"; //LOG_SYSERR << "sockets::shutdownWrite";
} }
} }
int Socket::read(char *buffer, uint64_t len) { int Socket::read(char *buffer, uint64_t len) {
@ -112,7 +111,7 @@ struct sockaddr_in6 Socket::getLocalAddr(int sockfd) {
if (::getsockname(sockfd, if (::getsockname(sockfd,
static_cast<struct sockaddr *>((void *)(&localaddr)), static_cast<struct sockaddr *>((void *)(&localaddr)),
&addrlen) < 0) { &addrlen) < 0) {
LOG_SYSERR << "sockets::getLocalAddr"; //LOG_SYSERR << "sockets::getLocalAddr";
} }
return localaddr; return localaddr;
} }
@ -124,7 +123,7 @@ struct sockaddr_in6 Socket::getPeerAddr(int sockfd) {
if (::getpeername(sockfd, if (::getpeername(sockfd,
static_cast<struct sockaddr *>((void *)(&peeraddr)), static_cast<struct sockaddr *>((void *)(&peeraddr)),
&addrlen) < 0) { &addrlen) < 0) {
LOG_SYSERR << "sockets::getPeerAddr"; //LOG_SYSERR << "sockets::getPeerAddr";
} }
return peeraddr; return peeraddr;
} }
@ -170,7 +169,7 @@ void Socket::setReusePort(bool on) {
&optval, &optval,
static_cast<socklen_t>(sizeof optval)); static_cast<socklen_t>(sizeof optval));
if (ret < 0 && on) { if (ret < 0 && on) {
LOG_SYSERR << "SO_REUSEPORT failed."; //LOG_SYSERR << "SO_REUSEPORT failed.";
} }
#else #else
if (on) { if (on) {

2
web_backends/drogon/trantor/net/inner/Socket.h → core/net/socket.h
View File

@ -12,6 +12,8 @@
* *
*/ */
// TODO Re enable logging
#pragma once #pragma once
#include <trantor/utils/NonCopyable.h> #include <trantor/utils/NonCopyable.h>

2
web_backends/drogon/trantor/net/TcpClient.cc
View File

@ -19,7 +19,7 @@
#include <algorithm> #include <algorithm>
#include <functional> #include <functional>
#include "Socket.h" #include "core/net/socket.h"
#include <stdio.h> // snprintf #include <stdio.h> // snprintf

2
web_backends/drogon/trantor/net/inner/Acceptor.h
View File

@ -16,7 +16,7 @@
#include <trantor/net/EventLoop.h> #include <trantor/net/EventLoop.h>
#include <trantor/utils/NonCopyable.h> #include <trantor/utils/NonCopyable.h>
#include "Socket.h" #include "core/net/socket.h"
#include "core/net/inet_address.h" #include "core/net/inet_address.h"
#include "Channel.h" #include "Channel.h"
#include <functional> #include <functional>

2
web_backends/drogon/trantor/net/inner/Connector.cc
View File

@ -14,7 +14,7 @@
#include "Connector.h" #include "Connector.h"
#include "Channel.h" #include "Channel.h"
#include "Socket.h" #include "core/net/socket.h"
using namespace trantor; using namespace trantor;

2
web_backends/drogon/trantor/net/inner/TcpConnectionImpl.cc
View File

@ -14,7 +14,7 @@
#include "TcpConnectionImpl.h" #include "TcpConnectionImpl.h"
#include "Channel.h" #include "Channel.h"
#include "Socket.h" #include "core/net/socket.h"
#ifdef __linux__ #ifdef __linux__
#include <sys/sendfile.h> #include <sys/sendfile.h>
#endif #endif