Skip to content

Commit

Permalink
[Net] Properly rename NetSocketPosix to NetSocketUnix
Browse files Browse the repository at this point in the history
  • Loading branch information
@Faless
Faless committed Nov 13, 2024
1 parent cb411fa commit 4b477c4
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 45 deletions.
70 changes: 35 additions & 35 deletions drivers/unix/net_socket_unix.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
#endif

size_t NetSocketPosix::_set_addr_storage(struct sockaddr_storage *p_addr, const IPAddress &p_ip, uint16_t p_port, IP::Type p_ip_type) {
size_t NetSocketUnix::_set_addr_storage(struct sockaddr_storage *p_addr, const IPAddress &p_ip, uint16_t p_port, IP::Type p_ip_type) {
memset(p_addr, 0, sizeof(struct sockaddr_storage));
if (p_ip_type == IP::TYPE_IPV6 || p_ip_type == IP::TYPE_ANY) { // IPv6 socket.

Expand Down Expand Up @@ -95,7 +95,7 @@ size_t NetSocketPosix::_set_addr_storage(struct sockaddr_storage *p_addr, const
}
}

void NetSocketPosix::_set_ip_port(struct sockaddr_storage *p_addr, IPAddress *r_ip, uint16_t *r_port) {
void NetSocketUnix::_set_ip_port(struct sockaddr_storage *p_addr, IPAddress *r_ip, uint16_t *r_port) {
if (p_addr->ss_family == AF_INET) {
struct sockaddr_in *addr4 = (struct sockaddr_in *)p_addr;
if (r_ip) {
Expand All @@ -115,21 +115,21 @@ void NetSocketPosix::_set_ip_port(struct sockaddr_storage *p_addr, IPAddress *r_
}
}

NetSocket *NetSocketPosix::_create_func() {
return memnew(NetSocketPosix);
NetSocket *NetSocketUnix::_create_func() {
return memnew(NetSocketUnix);
}

void NetSocketPosix::make_default() {
void NetSocketUnix::make_default() {
_create = _create_func;
}

void NetSocketPosix::cleanup() {
void NetSocketUnix::cleanup() {
}

NetSocketPosix::NetSocketPosix() {
NetSocketUnix::NetSocketUnix() {
}

NetSocketPosix::~NetSocketPosix() {
NetSocketUnix::~NetSocketUnix() {
close();
}

Expand All @@ -140,7 +140,7 @@ NetSocketPosix::~NetSocketPosix() {
#pragma GCC diagnostic ignored "-Wlogical-op"
#endif

NetSocketPosix::NetError NetSocketPosix::_get_socket_error() const {
NetSocketUnix::NetError NetSocketUnix::_get_socket_error() const {
if (errno == EISCONN) {
return ERR_NET_IS_CONNECTED;
}
Expand All @@ -167,7 +167,7 @@ NetSocketPosix::NetError NetSocketPosix::_get_socket_error() const {
#pragma GCC diagnostic pop
#endif

bool NetSocketPosix::_can_use_ip(const IPAddress &p_ip, const bool p_for_bind) const {
bool NetSocketUnix::_can_use_ip(const IPAddress &p_ip, const bool p_for_bind) const {
if (p_for_bind && !(p_ip.is_valid() || p_ip.is_wildcard())) {
return false;
} else if (!p_for_bind && !p_ip.is_valid()) {
Expand All @@ -178,7 +178,7 @@ bool NetSocketPosix::_can_use_ip(const IPAddress &p_ip, const bool p_for_bind) c
return !(_ip_type != IP::TYPE_ANY && !p_ip.is_wildcard() && _ip_type != type);
}

_FORCE_INLINE_ Error NetSocketPosix::_change_multicast_group(IPAddress p_ip, String p_if_name, bool p_add) {
_FORCE_INLINE_ Error NetSocketUnix::_change_multicast_group(IPAddress p_ip, String p_if_name, bool p_add) {
ERR_FAIL_COND_V(!is_open(), ERR_UNCONFIGURED);
ERR_FAIL_COND_V(!_can_use_ip(p_ip, false), ERR_INVALID_PARAMETER);

Expand Down Expand Up @@ -232,21 +232,21 @@ _FORCE_INLINE_ Error NetSocketPosix::_change_multicast_group(IPAddress p_ip, Str
return OK;
}

void NetSocketPosix::_set_socket(int p_sock, IP::Type p_ip_type, bool p_is_stream) {
void NetSocketUnix::_set_socket(int p_sock, IP::Type p_ip_type, bool p_is_stream) {
_sock = p_sock;
_ip_type = p_ip_type;
_is_stream = p_is_stream;
// Disable descriptor sharing with subprocesses.
_set_close_exec_enabled(true);
}

void NetSocketPosix::_set_close_exec_enabled(bool p_enabled) {
void NetSocketUnix::_set_close_exec_enabled(bool p_enabled) {
// Enable close on exec to avoid sharing with subprocesses. Off by default on Windows.
int opts = fcntl(_sock, F_GETFD);
fcntl(_sock, F_SETFD, opts | FD_CLOEXEC);
}

Error NetSocketPosix::open(Type p_sock_type, IP::Type &ip_type) {
Error NetSocketUnix::open(Type p_sock_type, IP::Type &ip_type) {
ERR_FAIL_COND_V(is_open(), ERR_ALREADY_IN_USE);
ERR_FAIL_COND_V(ip_type > IP::TYPE_ANY || ip_type < IP::TYPE_NONE, ERR_INVALID_PARAMETER);

Expand Down Expand Up @@ -299,7 +299,7 @@ Error NetSocketPosix::open(Type p_sock_type, IP::Type &ip_type) {
return OK;
}

void NetSocketPosix::close() {
void NetSocketUnix::close() {
if (_sock != -1) {
::close(_sock);
}
Expand All @@ -309,7 +309,7 @@ void NetSocketPosix::close() {
_is_stream = false;
}

Error NetSocketPosix::bind(IPAddress p_addr, uint16_t p_port) {
Error NetSocketUnix::bind(IPAddress p_addr, uint16_t p_port) {
ERR_FAIL_COND_V(!is_open(), ERR_UNCONFIGURED);
ERR_FAIL_COND_V(!_can_use_ip(p_addr, true), ERR_INVALID_PARAMETER);

Expand All @@ -326,7 +326,7 @@ Error NetSocketPosix::bind(IPAddress p_addr, uint16_t p_port) {
return OK;
}

Error NetSocketPosix::listen(int p_max_pending) {
Error NetSocketUnix::listen(int p_max_pending) {
ERR_FAIL_COND_V(!is_open(), ERR_UNCONFIGURED);

if (::listen(_sock, p_max_pending) != 0) {
Expand All @@ -339,7 +339,7 @@ Error NetSocketPosix::listen(int p_max_pending) {
return OK;
}

Error NetSocketPosix::connect_to_host(IPAddress p_host, uint16_t p_port) {
Error NetSocketUnix::connect_to_host(IPAddress p_host, uint16_t p_port) {
ERR_FAIL_COND_V(!is_open(), ERR_UNCONFIGURED);
ERR_FAIL_COND_V(!_can_use_ip(p_host, false), ERR_INVALID_PARAMETER);

Expand Down Expand Up @@ -367,7 +367,7 @@ Error NetSocketPosix::connect_to_host(IPAddress p_host, uint16_t p_port) {
return OK;
}

Error NetSocketPosix::poll(PollType p_type, int p_timeout) const {
Error NetSocketUnix::poll(PollType p_type, int p_timeout) const {
ERR_FAIL_COND_V(!is_open(), ERR_UNCONFIGURED);

struct pollfd pfd;
Expand Down Expand Up @@ -401,7 +401,7 @@ Error NetSocketPosix::poll(PollType p_type, int p_timeout) const {
return OK;
}

Error NetSocketPosix::recv(uint8_t *p_buffer, int p_len, int &r_read) {
Error NetSocketUnix::recv(uint8_t *p_buffer, int p_len, int &r_read) {
ERR_FAIL_COND_V(!is_open(), ERR_UNCONFIGURED);

r_read = ::recv(_sock, p_buffer, p_len, 0);
Expand All @@ -422,7 +422,7 @@ Error NetSocketPosix::recv(uint8_t *p_buffer, int p_len, int &r_read) {
return OK;
}

Error NetSocketPosix::recvfrom(uint8_t *p_buffer, int p_len, int &r_read, IPAddress &r_ip, uint16_t &r_port, bool p_peek) {
Error NetSocketUnix::recvfrom(uint8_t *p_buffer, int p_len, int &r_read, IPAddress &r_ip, uint16_t &r_port, bool p_peek) {
ERR_FAIL_COND_V(!is_open(), ERR_UNCONFIGURED);

struct sockaddr_storage from;
Expand Down Expand Up @@ -460,7 +460,7 @@ Error NetSocketPosix::recvfrom(uint8_t *p_buffer, int p_len, int &r_read, IPAddr
return OK;
}

Error NetSocketPosix::send(const uint8_t *p_buffer, int p_len, int &r_sent) {
Error NetSocketUnix::send(const uint8_t *p_buffer, int p_len, int &r_sent) {
ERR_FAIL_COND_V(!is_open(), ERR_UNCONFIGURED);

int flags = 0;
Expand All @@ -486,7 +486,7 @@ Error NetSocketPosix::send(const uint8_t *p_buffer, int p_len, int &r_sent) {
return OK;
}

Error NetSocketPosix::sendto(const uint8_t *p_buffer, int p_len, int &r_sent, IPAddress p_ip, uint16_t p_port) {
Error NetSocketUnix::sendto(const uint8_t *p_buffer, int p_len, int &r_sent, IPAddress p_ip, uint16_t p_port) {
ERR_FAIL_COND_V(!is_open(), ERR_UNCONFIGURED);

struct sockaddr_storage addr;
Expand All @@ -508,7 +508,7 @@ Error NetSocketPosix::sendto(const uint8_t *p_buffer, int p_len, int &r_sent, IP
return OK;
}

Error NetSocketPosix::set_broadcasting_enabled(bool p_enabled) {
Error NetSocketUnix::set_broadcasting_enabled(bool p_enabled) {
ERR_FAIL_COND_V(!is_open(), ERR_UNCONFIGURED);
// IPv6 has no broadcast support.
if (_ip_type == IP::TYPE_IPV6) {
Expand All @@ -523,7 +523,7 @@ Error NetSocketPosix::set_broadcasting_enabled(bool p_enabled) {
return OK;
}

void NetSocketPosix::set_blocking_enabled(bool p_enabled) {
void NetSocketUnix::set_blocking_enabled(bool p_enabled) {
ERR_FAIL_COND(!is_open());

int ret = 0;
Expand All @@ -539,7 +539,7 @@ void NetSocketPosix::set_blocking_enabled(bool p_enabled) {
}
}

void NetSocketPosix::set_ipv6_only_enabled(bool p_enabled) {
void NetSocketUnix::set_ipv6_only_enabled(bool p_enabled) {
ERR_FAIL_COND(!is_open());
// This option is only available in IPv6 sockets.
ERR_FAIL_COND(_ip_type == IP::TYPE_IPV4);
Expand All @@ -550,7 +550,7 @@ void NetSocketPosix::set_ipv6_only_enabled(bool p_enabled) {
}
}

void NetSocketPosix::set_tcp_no_delay_enabled(bool p_enabled) {
void NetSocketUnix::set_tcp_no_delay_enabled(bool p_enabled) {
ERR_FAIL_COND(!is_open());
ERR_FAIL_COND(!_is_stream); // Not TCP.

Expand All @@ -560,7 +560,7 @@ void NetSocketPosix::set_tcp_no_delay_enabled(bool p_enabled) {
}
}

void NetSocketPosix::set_reuse_address_enabled(bool p_enabled) {
void NetSocketUnix::set_reuse_address_enabled(bool p_enabled) {
ERR_FAIL_COND(!is_open());

int par = p_enabled ? 1 : 0;
Expand All @@ -569,11 +569,11 @@ void NetSocketPosix::set_reuse_address_enabled(bool p_enabled) {
}
}

bool NetSocketPosix::is_open() const {
bool NetSocketUnix::is_open() const {
return _sock != -1;
}

int NetSocketPosix::get_available_bytes() const {
int NetSocketUnix::get_available_bytes() const {
ERR_FAIL_COND_V(!is_open(), -1);

int len;
Expand All @@ -586,7 +586,7 @@ int NetSocketPosix::get_available_bytes() const {
return len;
}

Error NetSocketPosix::get_socket_address(IPAddress *r_ip, uint16_t *r_port) const {
Error NetSocketUnix::get_socket_address(IPAddress *r_ip, uint16_t *r_port) const {
ERR_FAIL_COND_V(!is_open(), FAILED);

struct sockaddr_storage saddr;
Expand All @@ -600,7 +600,7 @@ Error NetSocketPosix::get_socket_address(IPAddress *r_ip, uint16_t *r_port) cons
return OK;
}

Ref<NetSocket> NetSocketPosix::accept(IPAddress &r_ip, uint16_t &r_port) {
Ref<NetSocket> NetSocketUnix::accept(IPAddress &r_ip, uint16_t &r_port) {
Ref<NetSocket> out;
ERR_FAIL_COND_V(!is_open(), out);

Expand All @@ -615,17 +615,17 @@ Ref<NetSocket> NetSocketPosix::accept(IPAddress &r_ip, uint16_t &r_port) {

_set_ip_port(&their_addr, &r_ip, &r_port);

NetSocketPosix *ns = memnew(NetSocketPosix);
NetSocketUnix *ns = memnew(NetSocketUnix);
ns->_set_socket(fd, _ip_type, _is_stream);
ns->set_blocking_enabled(false);
return Ref<NetSocket>(ns);
}

Error NetSocketPosix::join_multicast_group(const IPAddress &p_multi_address, const String &p_if_name) {
Error NetSocketUnix::join_multicast_group(const IPAddress &p_multi_address, const String &p_if_name) {
return _change_multicast_group(p_multi_address, p_if_name, true);
}

Error NetSocketPosix::leave_multicast_group(const IPAddress &p_multi_address, const String &p_if_name) {
Error NetSocketUnix::leave_multicast_group(const IPAddress &p_multi_address, const String &p_if_name) {
return _change_multicast_group(p_multi_address, p_if_name, false);
}

Expand Down
6 changes: 3 additions & 3 deletions drivers/unix/net_socket_unix.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

#include <sys/socket.h>

class NetSocketPosix : public NetSocket {
class NetSocketUnix : public NetSocket {
private:
int _sock = -1;
IP::Type _ip_type = IP::TYPE_NONE;
Expand Down Expand Up @@ -93,8 +93,8 @@ class NetSocketPosix : public NetSocket {
virtual Error join_multicast_group(const IPAddress &p_multi_address, const String &p_if_name) override;
virtual Error leave_multicast_group(const IPAddress &p_multi_address, const String &p_if_name) override;

NetSocketPosix();
~NetSocketPosix() override;
NetSocketUnix();
~NetSocketUnix() override;
};

#endif // UNIX_ENABLED && !UNIX_SOCKET_UNAVAILABLE
Expand Down
4 changes: 2 additions & 2 deletions drivers/unix/os_unix.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ void OS_Unix::initialize_core() {
DirAccess::make_default<DirAccessUnix>(DirAccess::ACCESS_USERDATA);
DirAccess::make_default<DirAccessUnix>(DirAccess::ACCESS_FILESYSTEM);

NetSocketPosix::make_default();
NetSocketUnix::make_default();
IPUnix::make_default();
process_map = memnew((HashMap<ProcessID, ProcessInfo>));

Expand All @@ -176,7 +176,7 @@ void OS_Unix::initialize_core() {

void OS_Unix::finalize_core() {
memdelete(process_map);
NetSocketPosix::cleanup();
NetSocketUnix::cleanup();
}

Vector<String> OS_Unix::get_video_adapter_driver_info() const {
Expand Down
8 changes: 4 additions & 4 deletions platform/android/net_socket_android.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ NetSocketAndroid::~NetSocketAndroid() {
}

void NetSocketAndroid::close() {
NetSocketPosix::close();
NetSocketUnix::close();
if (wants_broadcast) {
multicast_lock_release();
}
Expand All @@ -96,7 +96,7 @@ void NetSocketAndroid::close() {
}

Error NetSocketAndroid::set_broadcasting_enabled(bool p_enabled) {
Error err = NetSocketPosix::set_broadcasting_enabled(p_enabled);
Error err = NetSocketUnix::set_broadcasting_enabled(p_enabled);
if (err != OK) {
return err;
}
Expand All @@ -115,7 +115,7 @@ Error NetSocketAndroid::set_broadcasting_enabled(bool p_enabled) {
}

Error NetSocketAndroid::join_multicast_group(const IPAddress &p_multi_address, const String &p_if_name) {
Error err = NetSocketPosix::join_multicast_group(p_multi_address, p_if_name);
Error err = NetSocketUnix::join_multicast_group(p_multi_address, p_if_name);
if (err != OK) {
return err;
}
Expand All @@ -129,7 +129,7 @@ Error NetSocketAndroid::join_multicast_group(const IPAddress &p_multi_address, c
}

Error NetSocketAndroid::leave_multicast_group(const IPAddress &p_multi_address, const String &p_if_name) {
Error err = NetSocketPosix::leave_multicast_group(p_multi_address, p_if_name);
Error err = NetSocketUnix::leave_multicast_group(p_multi_address, p_if_name);
if (err != OK) {
return err;
}
Expand Down
2 changes: 1 addition & 1 deletion platform/android/net_socket_android.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
* the lock when broadcasting is enabled/disabled on a socket, or that socket
* joins/leaves a multicast group.
*/
class NetSocketAndroid : public NetSocketPosix {
class NetSocketAndroid : public NetSocketUnix {
private:
static jobject net_utils;
static jclass cls;
Expand Down

0 comments on commit 4b477c4

Please sign in to comment.