You've already forked godot
mirror of
https://github.com/godotengine/godot.git
synced 2025-11-23 15:16:17 +00:00
[Web] Implement dummy IPWeb instead of IPUnix
Note: This commit ties the IPUnix to the UNIX_SOCKET_UNAVAILABLE define, disabling it when set. It is maybe not semantically correct (getifaddrs) is not part of the "socket" API, but it's reasonable to expect that a platform not supporting Unix-style sockets, would also not support other Unix network functions.
This commit is contained in:
@@ -28,7 +28,7 @@
|
|||||||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||||
/**************************************************************************/
|
/**************************************************************************/
|
||||||
|
|
||||||
#if defined(UNIX_ENABLED)
|
#if defined(UNIX_ENABLED) && !defined(UNIX_SOCKET_UNAVAILABLE)
|
||||||
|
|
||||||
#include "ip_unix.h"
|
#include "ip_unix.h"
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,7 @@
|
|||||||
#ifndef IP_UNIX_H
|
#ifndef IP_UNIX_H
|
||||||
#define IP_UNIX_H
|
#define IP_UNIX_H
|
||||||
|
|
||||||
#if defined(UNIX_ENABLED)
|
#if defined(UNIX_ENABLED) && !defined(UNIX_SOCKET_UNAVAILABLE)
|
||||||
|
|
||||||
#include "core/io/ip.h"
|
#include "core/io/ip.h"
|
||||||
|
|
||||||
|
|||||||
@@ -169,8 +169,8 @@ void OS_Unix::initialize_core() {
|
|||||||
|
|
||||||
#ifndef UNIX_SOCKET_UNAVAILABLE
|
#ifndef UNIX_SOCKET_UNAVAILABLE
|
||||||
NetSocketUnix::make_default();
|
NetSocketUnix::make_default();
|
||||||
#endif
|
|
||||||
IPUnix::make_default();
|
IPUnix::make_default();
|
||||||
|
#endif
|
||||||
process_map = memnew((HashMap<ProcessID, ProcessInfo>));
|
process_map = memnew((HashMap<ProcessID, ProcessInfo>));
|
||||||
|
|
||||||
_setup_clock();
|
_setup_clock();
|
||||||
|
|||||||
@@ -26,6 +26,7 @@ web_files = [
|
|||||||
"http_client_web.cpp",
|
"http_client_web.cpp",
|
||||||
"javascript_bridge_singleton.cpp",
|
"javascript_bridge_singleton.cpp",
|
||||||
"web_main.cpp",
|
"web_main.cpp",
|
||||||
|
"ip_web.cpp",
|
||||||
"os_web.cpp",
|
"os_web.cpp",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
48
platform/web/ip_web.cpp
Normal file
48
platform/web/ip_web.cpp
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
/**************************************************************************/
|
||||||
|
/* ip_web.cpp */
|
||||||
|
/**************************************************************************/
|
||||||
|
/* This file is part of: */
|
||||||
|
/* GODOT ENGINE */
|
||||||
|
/* https://godotengine.org */
|
||||||
|
/**************************************************************************/
|
||||||
|
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
|
||||||
|
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
|
||||||
|
/* */
|
||||||
|
/* Permission is hereby granted, free of charge, to any person obtaining */
|
||||||
|
/* a copy of this software and associated documentation files (the */
|
||||||
|
/* "Software"), to deal in the Software without restriction, including */
|
||||||
|
/* without limitation the rights to use, copy, modify, merge, publish, */
|
||||||
|
/* distribute, sublicense, and/or sell copies of the Software, and to */
|
||||||
|
/* permit persons to whom the Software is furnished to do so, subject to */
|
||||||
|
/* the following conditions: */
|
||||||
|
/* */
|
||||||
|
/* The above copyright notice and this permission notice shall be */
|
||||||
|
/* included in all copies or substantial portions of the Software. */
|
||||||
|
/* */
|
||||||
|
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
|
||||||
|
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
|
||||||
|
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
|
||||||
|
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
|
||||||
|
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
|
||||||
|
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
||||||
|
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||||
|
/**************************************************************************/
|
||||||
|
|
||||||
|
#include "ip_web.h"
|
||||||
|
|
||||||
|
void IPWeb::_resolve_hostname(List<IPAddress> &r_addresses, const String &p_hostname, Type p_type) const {
|
||||||
|
}
|
||||||
|
|
||||||
|
void IPWeb::get_local_interfaces(HashMap<String, Interface_Info> *r_interfaces) const {
|
||||||
|
}
|
||||||
|
|
||||||
|
void IPWeb::make_default() {
|
||||||
|
_create = _create_web;
|
||||||
|
}
|
||||||
|
|
||||||
|
IP *IPWeb::_create_web() {
|
||||||
|
return memnew(IPWeb);
|
||||||
|
}
|
||||||
|
|
||||||
|
IPWeb::IPWeb() {
|
||||||
|
}
|
||||||
51
platform/web/ip_web.h
Normal file
51
platform/web/ip_web.h
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
/**************************************************************************/
|
||||||
|
/* ip_web.h */
|
||||||
|
/**************************************************************************/
|
||||||
|
/* This file is part of: */
|
||||||
|
/* GODOT ENGINE */
|
||||||
|
/* https://godotengine.org */
|
||||||
|
/**************************************************************************/
|
||||||
|
/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
|
||||||
|
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
|
||||||
|
/* */
|
||||||
|
/* Permission is hereby granted, free of charge, to any person obtaining */
|
||||||
|
/* a copy of this software and associated documentation files (the */
|
||||||
|
/* "Software"), to deal in the Software without restriction, including */
|
||||||
|
/* without limitation the rights to use, copy, modify, merge, publish, */
|
||||||
|
/* distribute, sublicense, and/or sell copies of the Software, and to */
|
||||||
|
/* permit persons to whom the Software is furnished to do so, subject to */
|
||||||
|
/* the following conditions: */
|
||||||
|
/* */
|
||||||
|
/* The above copyright notice and this permission notice shall be */
|
||||||
|
/* included in all copies or substantial portions of the Software. */
|
||||||
|
/* */
|
||||||
|
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
|
||||||
|
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
|
||||||
|
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
|
||||||
|
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
|
||||||
|
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
|
||||||
|
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
|
||||||
|
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||||
|
/**************************************************************************/
|
||||||
|
|
||||||
|
#ifndef IP_WEB_H
|
||||||
|
#define IP_WEB_H
|
||||||
|
|
||||||
|
#include "core/io/ip.h"
|
||||||
|
|
||||||
|
class IPWeb : public IP {
|
||||||
|
GDCLASS(IPWeb, IP);
|
||||||
|
|
||||||
|
virtual void _resolve_hostname(List<IPAddress> &r_addresses, const String &p_hostname, Type p_type = TYPE_ANY) const override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
static IP *_create_web();
|
||||||
|
|
||||||
|
public:
|
||||||
|
virtual void get_local_interfaces(HashMap<String, Interface_Info> *r_interfaces) const override;
|
||||||
|
|
||||||
|
static void make_default();
|
||||||
|
IPWeb();
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // IP_WEB_H
|
||||||
@@ -33,6 +33,7 @@
|
|||||||
#include "api/javascript_bridge_singleton.h"
|
#include "api/javascript_bridge_singleton.h"
|
||||||
#include "display_server_web.h"
|
#include "display_server_web.h"
|
||||||
#include "godot_js.h"
|
#include "godot_js.h"
|
||||||
|
#include "ip_web.h"
|
||||||
|
|
||||||
#include "core/config/project_settings.h"
|
#include "core/config/project_settings.h"
|
||||||
#include "core/debugger/engine_debugger.h"
|
#include "core/debugger/engine_debugger.h"
|
||||||
@@ -53,6 +54,7 @@ void OS_Web::alert(const String &p_alert, const String &p_title) {
|
|||||||
// Lifecycle
|
// Lifecycle
|
||||||
void OS_Web::initialize() {
|
void OS_Web::initialize() {
|
||||||
OS_Unix::initialize_core();
|
OS_Unix::initialize_core();
|
||||||
|
IPWeb::make_default();
|
||||||
DisplayServerWeb::register_web_driver();
|
DisplayServerWeb::register_web_driver();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user