Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-22 04:06:14 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Net] Properly rename NetSocketPosix to NetSocketUnix

Browse Source
This commit is contained in:
Fabio Alessandrelli 2024-11-13 10:21:29 +01:00
parent cb411fa960
commit fc52821cfb
5 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
drivers/unix/net_socket_unix.cpp
View File

@ -60,7 +60,7 @@
#define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP #define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
#endif #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)); memset(p_addr, 0, sizeof(struct sockaddr_storage));
if (p_ip_type == IP::TYPE_IPV6 || p_ip_type == IP::TYPE_ANY) { // IPv6 socket. if (p_ip_type == IP::TYPE_IPV6 || p_ip_type == IP::TYPE_ANY) { // IPv6 socket.
@ -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) { if (p_addr->ss_family == AF_INET) {
struct sockaddr_in *addr4 = (struct sockaddr_in *)p_addr; struct sockaddr_in *addr4 = (struct sockaddr_in *)p_addr;
if (r_ip) { if (r_ip) {
@ -115,21 +115,21 @@ void NetSocketPosix::_set_ip_port(struct sockaddr_storage *p_addr, IPAddress *r_
} }
} }
NetSocket *NetSocketPosix::_create_func() { NetSocket *NetSocketUnix::_create_func() {
return memnew(NetSocketPosix); return memnew(NetSocketUnix);
} }
void NetSocketPosix::make_default() { void NetSocketUnix::make_default() {
_create = _create_func; _create = _create_func;
} }
void NetSocketPosix::cleanup() { void NetSocketUnix::cleanup() {
} }
NetSocketPosix::NetSocketPosix() { NetSocketUnix::NetSocketUnix() {
} }
NetSocketPosix::~NetSocketPosix() { NetSocketUnix::~NetSocketUnix() {
close(); close();
} }
@ -140,7 +140,7 @@ NetSocketPosix::~NetSocketPosix() {
#pragma GCC diagnostic ignored "-Wlogical-op" #pragma GCC diagnostic ignored "-Wlogical-op"
#endif #endif
NetSocketPosix::NetError NetSocketPosix::_get_socket_error() const { NetSocketUnix::NetError NetSocketUnix::_get_socket_error() const {
if (errno == EISCONN) { if (errno == EISCONN) {
return ERR_NET_IS_CONNECTED; return ERR_NET_IS_CONNECTED;
} }
@ -167,7 +167,7 @@ NetSocketPosix::NetError NetSocketPosix::_get_socket_error() const {
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #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())) { if (p_for_bind && !(p_ip.is_valid() || p_ip.is_wildcard())) {
return false; return false;
} else if (!p_for_bind && !p_ip.is_valid()) { } else if (!p_for_bind && !p_ip.is_valid()) {
@ -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); 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(!is_open(), ERR_UNCONFIGURED);
ERR_FAIL_COND_V(!_can_use_ip(p_ip, false), ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(!_can_use_ip(p_ip, false), ERR_INVALID_PARAMETER);
@ -232,7 +232,7 @@ _FORCE_INLINE_ Error NetSocketPosix::_change_multicast_group(IPAddress p_ip, Str
return OK; 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; _sock = p_sock;
_ip_type = p_ip_type; _ip_type = p_ip_type;
_is_stream = p_is_stream; _is_stream = p_is_stream;
@ -240,13 +240,13 @@ void NetSocketPosix::_set_socket(int p_sock, IP::Type p_ip_type, bool p_is_strea
_set_close_exec_enabled(true); _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. // Enable close on exec to avoid sharing with subprocesses. Off by default on Windows.
int opts = fcntl(_sock, F_GETFD); int opts = fcntl(_sock, F_GETFD);
fcntl(_sock, F_SETFD, opts | FD_CLOEXEC); 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(is_open(), ERR_ALREADY_IN_USE);
ERR_FAIL_COND_V(ip_type > IP::TYPE_ANY || ip_type < IP::TYPE_NONE, ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(ip_type > IP::TYPE_ANY || ip_type < IP::TYPE_NONE, ERR_INVALID_PARAMETER);
@ -299,7 +299,7 @@ Error NetSocketPosix::open(Type p_sock_type, IP::Type &ip_type) {
return OK; return OK;
} }
void NetSocketPosix::close() { void NetSocketUnix::close() {
if (_sock != -1) { if (_sock != -1) {
::close(_sock); ::close(_sock);
} }
@ -309,7 +309,7 @@ void NetSocketPosix::close() {
_is_stream = false; _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(!is_open(), ERR_UNCONFIGURED);
ERR_FAIL_COND_V(!_can_use_ip(p_addr, true), ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(!_can_use_ip(p_addr, true), ERR_INVALID_PARAMETER);
@ -326,7 +326,7 @@ Error NetSocketPosix::bind(IPAddress p_addr, uint16_t p_port) {
return OK; return OK;
} }
Error NetSocketPosix::listen(int p_max_pending) { Error NetSocketUnix::listen(int p_max_pending) {
ERR_FAIL_COND_V(!is_open(), ERR_UNCONFIGURED); ERR_FAIL_COND_V(!is_open(), ERR_UNCONFIGURED);
if (::listen(_sock, p_max_pending) != 0) { if (::listen(_sock, p_max_pending) != 0) {
@ -339,7 +339,7 @@ Error NetSocketPosix::listen(int p_max_pending) {
return OK; 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(!is_open(), ERR_UNCONFIGURED);
ERR_FAIL_COND_V(!_can_use_ip(p_host, false), ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(!_can_use_ip(p_host, false), ERR_INVALID_PARAMETER);
@ -367,7 +367,7 @@ Error NetSocketPosix::connect_to_host(IPAddress p_host, uint16_t p_port) {
return OK; 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); ERR_FAIL_COND_V(!is_open(), ERR_UNCONFIGURED);
struct pollfd pfd; struct pollfd pfd;
@ -401,7 +401,7 @@ Error NetSocketPosix::poll(PollType p_type, int p_timeout) const {
return OK; 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); ERR_FAIL_COND_V(!is_open(), ERR_UNCONFIGURED);
r_read = ::recv(_sock, p_buffer, p_len, 0); r_read = ::recv(_sock, p_buffer, p_len, 0);
@ -422,7 +422,7 @@ Error NetSocketPosix::recv(uint8_t *p_buffer, int p_len, int &r_read) {
return OK; 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); ERR_FAIL_COND_V(!is_open(), ERR_UNCONFIGURED);
struct sockaddr_storage from; struct sockaddr_storage from;
@ -460,7 +460,7 @@ Error NetSocketPosix::recvfrom(uint8_t *p_buffer, int p_len, int &r_read, IPAddr
return OK; 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); ERR_FAIL_COND_V(!is_open(), ERR_UNCONFIGURED);
int flags = 0; int flags = 0;
@ -486,7 +486,7 @@ Error NetSocketPosix::send(const uint8_t *p_buffer, int p_len, int &r_sent) {
return OK; 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); ERR_FAIL_COND_V(!is_open(), ERR_UNCONFIGURED);
struct sockaddr_storage addr; struct sockaddr_storage addr;
@ -508,7 +508,7 @@ Error NetSocketPosix::sendto(const uint8_t *p_buffer, int p_len, int &r_sent, IP
return OK; 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); ERR_FAIL_COND_V(!is_open(), ERR_UNCONFIGURED);
// IPv6 has no broadcast support. // IPv6 has no broadcast support.
if (_ip_type == IP::TYPE_IPV6) { if (_ip_type == IP::TYPE_IPV6) {
@ -523,7 +523,7 @@ Error NetSocketPosix::set_broadcasting_enabled(bool p_enabled) {
return OK; return OK;
} }
void NetSocketPosix::set_blocking_enabled(bool p_enabled) { void NetSocketUnix::set_blocking_enabled(bool p_enabled) {
ERR_FAIL_COND(!is_open()); ERR_FAIL_COND(!is_open());
int ret = 0; int ret = 0;
@ -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()); ERR_FAIL_COND(!is_open());
// This option is only available in IPv6 sockets. // This option is only available in IPv6 sockets.
ERR_FAIL_COND(_ip_type == IP::TYPE_IPV4); ERR_FAIL_COND(_ip_type == IP::TYPE_IPV4);
@ -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_open());
ERR_FAIL_COND(!_is_stream); // Not TCP. ERR_FAIL_COND(!_is_stream); // Not TCP.
@ -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()); ERR_FAIL_COND(!is_open());
int par = p_enabled ? 1 : 0; int par = p_enabled ? 1 : 0;
@ -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; return _sock != -1;
} }
int NetSocketPosix::get_available_bytes() const { int NetSocketUnix::get_available_bytes() const {
ERR_FAIL_COND_V(!is_open(), -1); ERR_FAIL_COND_V(!is_open(), -1);
int len; int len;
@ -586,7 +586,7 @@ int NetSocketPosix::get_available_bytes() const {
return len; 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); ERR_FAIL_COND_V(!is_open(), FAILED);
struct sockaddr_storage saddr; struct sockaddr_storage saddr;
@ -600,7 +600,7 @@ Error NetSocketPosix::get_socket_address(IPAddress *r_ip, uint16_t *r_port) cons
return OK; 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; Ref<NetSocket> out;
ERR_FAIL_COND_V(!is_open(), out); ERR_FAIL_COND_V(!is_open(), out);
@ -615,17 +615,17 @@ Ref<NetSocket> NetSocketPosix::accept(IPAddress &r_ip, uint16_t &r_port) {
_set_ip_port(&their_addr, &r_ip, &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_socket(fd, _ip_type, _is_stream);
ns->set_blocking_enabled(false); ns->set_blocking_enabled(false);
return Ref<NetSocket>(ns); 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); 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); return _change_multicast_group(p_multi_address, p_if_name, false);
} }

6
drivers/unix/net_socket_unix.h
View File

@ -37,7 +37,7 @@
#include <sys/socket.h> #include <sys/socket.h>
class NetSocketPosix : public NetSocket { class NetSocketUnix : public NetSocket {
private: private:
int _sock = -1; int _sock = -1;
IP::Type _ip_type = IP::TYPE_NONE; IP::Type _ip_type = IP::TYPE_NONE;
@ -93,8 +93,8 @@ public:
virtual Error join_multicast_group(const IPAddress &p_multi_address, const String &p_if_name) override; 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; virtual Error leave_multicast_group(const IPAddress &p_multi_address, const String &p_if_name) override;
NetSocketPosix(); NetSocketUnix();
~NetSocketPosix() override; ~NetSocketUnix() override;
}; };
#endif // UNIX_ENABLED && !UNIX_SOCKET_UNAVAILABLE #endif // UNIX_ENABLED && !UNIX_SOCKET_UNAVAILABLE

8
drivers/unix/os_unix.cpp
View File

@ -167,7 +167,9 @@ void OS_Unix::initialize_core() {
DirAccess::make_default<DirAccessUnix>(DirAccess::ACCESS_USERDATA); DirAccess::make_default<DirAccessUnix>(DirAccess::ACCESS_USERDATA);
DirAccess::make_default<DirAccessUnix>(DirAccess::ACCESS_FILESYSTEM); DirAccess::make_default<DirAccessUnix>(DirAccess::ACCESS_FILESYSTEM);
NetSocketPosix::make_default(); #ifndef UNIX_SOCKET_UNAVAILABLE
NetSocketUnix::make_default();
#endif
IPUnix::make_default(); IPUnix::make_default();
process_map = memnew((HashMap<ProcessID, ProcessInfo>)); process_map = memnew((HashMap<ProcessID, ProcessInfo>));
@ -176,7 +178,9 @@ void OS_Unix::initialize_core() {
void OS_Unix::finalize_core() { void OS_Unix::finalize_core() {
memdelete(process_map); memdelete(process_map);
NetSocketPosix::cleanup(); #ifndef UNIX_SOCKET_UNAVAILABLE
NetSocketUnix::cleanup();
#endif
} }
Vector<String> OS_Unix::get_video_adapter_driver_info() const { Vector<String> OS_Unix::get_video_adapter_driver_info() const {

8
platform/android/net_socket_android.cpp
View File

@ -84,7 +84,7 @@ NetSocketAndroid::~NetSocketAndroid() {
} }
void NetSocketAndroid::close() { void NetSocketAndroid::close() {
NetSocketPosix::close(); NetSocketUnix::close();
if (wants_broadcast) { if (wants_broadcast) {
multicast_lock_release(); multicast_lock_release();
} }
@ -96,7 +96,7 @@ void NetSocketAndroid::close() {
} }
Error NetSocketAndroid::set_broadcasting_enabled(bool p_enabled) { 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) { if (err != OK) {
return err; return err;
} }
@ -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 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) { if (err != OK) {
return err; return err;
} }
@ -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 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) { if (err != OK) {
return err; return err;
} }

2
platform/android/net_socket_android.h
View File

@ -44,7 +44,7 @@
* the lock when broadcasting is enabled/disabled on a socket, or that socket * the lock when broadcasting is enabled/disabled on a socket, or that socket
* joins/leaves a multicast group. * joins/leaves a multicast group.
*/ */
class NetSocketAndroid : public NetSocketPosix { class NetSocketAndroid : public NetSocketUnix {
private: private:
static jobject net_utils; static jobject net_utils;
static jclass cls; static jclass cls;