Relintai/sfw
1
0
Fork 0
mirror of https://github.com/Relintai/sfw.git synced 2025-04-07 17:01:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Split set_non_block_and_close_on_exit() in Socket.

Browse Source
This commit is contained in:
Relintai 2024-01-18 18:18:32 +01:00
parent d2089a0ccb
commit c853c76a68
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sfw/core/socket.cpp
View File

@ -64,7 +64,7 @@ void Socket::close_socket() {
} }
// taken from muduo // taken from muduo
int Socket::set_non_block_and_close_on_exit() { int Socket::set_non_block() {
ERR_FAIL_COND_V(_socket == 0, -1); ERR_FAIL_COND_V(_socket == 0, -1);
#if defined(_WIN64) || defined(_WIN32) #if defined(_WIN64) || defined(_WIN32)
@ -85,10 +85,22 @@ int Socket::set_non_block_and_close_on_exit() {
int ret = ::fcntl(_socket, F_SETFL, flags); int ret = ::fcntl(_socket, F_SETFL, flags);
// TODO check // TODO check
return ret;
#endif
}
// taken from muduo
int Socket::set_close_on_exit() {
ERR_FAIL_COND_V(_socket == 0, -1);
#if defined(_WIN64) || defined(_WIN32)
// TODO how to set FD_CLOEXEC on windows? is it necessary?
return 0;
#else
// close-on-exec // close-on-exec
flags = ::fcntl(_socket, F_GETFD, 0); int flags = ::fcntl(_socket, F_GETFD, 0);
flags |= FD_CLOEXEC; flags |= FD_CLOEXEC;
ret = ::fcntl(_socket, F_SETFD, flags); int ret = ::fcntl(_socket, F_SETFD, flags);
// TODO check // TODO check
return ret; return ret;

3
sfw/core/socket.h
View File

@ -46,7 +46,8 @@ public:
int set_reuse_port(bool on); int set_reuse_port(bool on);
void set_keep_alive(bool on); void set_keep_alive(bool on);
int set_non_block_and_close_on_exit(); int set_non_block();
int set_close_on_exit();
int get_error(); int get_error();