mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-26 02:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Network) Move natt files to "network"

Browse Source
This commit is contained in:
Cthulhu-throwaway 2022-05-18 23:23:40 -03:00
parent 011e371e42
commit f0baf977fa
8 changed files with 33 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.common
View File

@ -2108,8 +2108,8 @@ ifeq ($(HAVE_NETWORKING), 1)
$(LIBRETRO_COMM_DIR)/net/net_http.o \ $(LIBRETRO_COMM_DIR)/net/net_http.o \
$(LIBRETRO_COMM_DIR)/net/net_http_parse.o \ $(LIBRETRO_COMM_DIR)/net/net_http_parse.o \
$(LIBRETRO_COMM_DIR)/net/net_socket.o \ $(LIBRETRO_COMM_DIR)/net/net_socket.o \
$(LIBRETRO_COMM_DIR)/net/net_natt.o \
core_updater_list.o \ core_updater_list.o \
network/natt.o \
network/net_http_special.o \ network/net_http_special.o \
tasks/task_http.o \ tasks/task_http.o \
tasks/task_netplay_lan_scan.o \ tasks/task_netplay_lan_scan.o \

2
griffin/griffin.c
View File

@ -1330,12 +1330,12 @@ THREAD
NETPLAY NETPLAY
============================================================ */ ============================================================ */
#ifdef HAVE_NETWORKING #ifdef HAVE_NETWORKING
#include "../network/natt.c"
#include "../network/netplay/netplay_frontend.c" #include "../network/netplay/netplay_frontend.c"
#include "../network/netplay/netplay_room_parse.c" #include "../network/netplay/netplay_room_parse.c"
#include "../libretro-common/net/net_compat.c" #include "../libretro-common/net/net_compat.c"
#include "../libretro-common/net/net_socket.c" #include "../libretro-common/net/net_socket.c"
#include "../libretro-common/net/net_http.c" #include "../libretro-common/net/net_http.c"
#include "../libretro-common/net/net_natt.c"
#if !defined(HAVE_SOCKET_LEGACY) #if !defined(HAVE_SOCKET_LEGACY)
#include "../libretro-common/net/net_ifinfo.c" #include "../libretro-common/net/net_ifinfo.c"
#endif #endif

31
libretro-common/net/net_natt.c → network/natt.c
View File

@ -1,23 +1,16 @@
/* Copyright (C) 2016-2022 The RetroArch team /* RetroArch - A frontend for libretro.
* Copyright (C) 2021-2022 - Roberto V. Rampim
* *
* --------------------------------------------------------------------------------------- * RetroArch is free software: you can redistribute it and/or modify it under the terms
* The following license statement only applies to this file (net_natt.c). * of the GNU General Public License as published by the Free Software Found-
* --------------------------------------------------------------------------------------- * ation, either version 3 of the License, or (at your option) any later version.
* *
* Permission is hereby granted, free of charge, * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* to any person obtaining a copy of this software and associated documentation files (the "Software"), * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* to deal in the Software without restriction, including without limitation the rights to * PURPOSE. See the GNU General Public License for more details.
* 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. * You should have received a copy of the GNU General Public License along with RetroArch.
* * If not, see <http://www.gnu.org/licenses/>.
* 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 <stdlib.h> #include <stdlib.h>
@ -33,9 +26,9 @@
#include <net/net_ifinfo.h> #include <net/net_ifinfo.h>
#endif #endif
#include "../../tasks/tasks_internal.h" #include "../tasks/tasks_internal.h"
#include <net/net_natt.h> #include "natt.h"
static bool translate_addr(struct sockaddr_in *addr, static bool translate_addr(struct sockaddr_in *addr,
char *host, size_t hostlen, char *port, size_t portlen) char *host, size_t hostlen, char *port, size_t portlen)

42
libretro-common/include/net/net_natt.h → network/natt.h
View File

@ -1,35 +1,27 @@
/* Copyright (C) 2010-2022 The RetroArch team /* RetroArch - A frontend for libretro.
* Copyright (C) 2021-2022 - Roberto V. Rampim
* *
* --------------------------------------------------------------------------------------- * RetroArch is free software: you can redistribute it and/or modify it under the terms
* The following license statement only applies to this file (net_natt.h). * of the GNU General Public License as published by the Free Software Found-
* --------------------------------------------------------------------------------------- * ation, either version 3 of the License, or (at your option) any later version.
* *
* Permission is hereby granted, free of charge, * RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* to any person obtaining a copy of this software and associated documentation files (the "Software"), * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* to deal in the Software without restriction, including without limitation the rights to * PURPOSE. See the GNU General Public License for more details.
* 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. * You should have received a copy of the GNU General Public License along with RetroArch.
* * If not, see <http://www.gnu.org/licenses/>.
* 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 _LIBRETRO_SDK_NET_NATT_H #ifndef __RARCH_NATT_H
#define _LIBRETRO_SDK_NET_NATT_H #define __RARCH_NATT_H
#include <libretro.h>
#include <boolean.h>
#include <net/net_compat.h> #include <net/net_compat.h>
#include <net/net_socket.h> #include <net/net_socket.h>
#include <retro_common_api.h>
RETRO_BEGIN_DECLS
enum natt_forward_type enum natt_forward_type
{ {
NATT_FORWARD_TYPE_NONE, NATT_FORWARD_TYPE_NONE,
@ -182,6 +174,4 @@ bool natt_open_port(struct natt_device *device,
bool natt_close_port(struct natt_device *device, bool natt_close_port(struct natt_device *device,
struct natt_request *request, bool block); struct natt_request *request, bool block);
RETRO_END_DECLS #endif /* __RARCH_NATT_H */
#endif

3
network/netplay/netplay.h
View File

@ -31,11 +31,12 @@
#include <net/net_compat.h> #include <net/net_compat.h>
#include <net/net_ifinfo.h> #include <net/net_ifinfo.h>
#include <net/net_natt.h>
#include <retro_miscellaneous.h> #include <retro_miscellaneous.h>
#include "../../core.h" #include "../../core.h"
#include "../natt.h"
#include "netplay_protocol.h" #include "netplay_protocol.h"
#define NETPLAY_NICK_LEN 32 #define NETPLAY_NICK_LEN 32

2
pkg/apple/RetroArch_iOS11_Metal.xcodeproj/project.pbxproj
View File

@ -142,7 +142,6 @@
92B9EB7A24E0518700E6CFB2 /* net_ifinfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_ifinfo.h; sourceTree = "<group>"; }; 92B9EB7A24E0518700E6CFB2 /* net_ifinfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_ifinfo.h; sourceTree = "<group>"; };
92B9EB7B24E0518700E6CFB2 /* net_compat.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_compat.h; sourceTree = "<group>"; }; 92B9EB7B24E0518700E6CFB2 /* net_compat.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_compat.h; sourceTree = "<group>"; };
92B9EB7C24E0518700E6CFB2 /* net_socket.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_socket.h; sourceTree = "<group>"; }; 92B9EB7C24E0518700E6CFB2 /* net_socket.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_socket.h; sourceTree = "<group>"; };
92B9EB7D24E0518700E6CFB2 /* net_natt.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_natt.h; sourceTree = "<group>"; };
92B9EB7E24E0518700E6CFB2 /* net_socket_ssl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_socket_ssl.h; sourceTree = "<group>"; }; 92B9EB7E24E0518700E6CFB2 /* net_socket_ssl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_socket_ssl.h; sourceTree = "<group>"; };
92B9EB7F24E0518700E6CFB2 /* net_http.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_http.h; sourceTree = "<group>"; }; 92B9EB7F24E0518700E6CFB2 /* net_http.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_http.h; sourceTree = "<group>"; };
92B9EB8024E0518700E6CFB2 /* net_http_parse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_http_parse.h; sourceTree = "<group>"; }; 92B9EB8024E0518700E6CFB2 /* net_http_parse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_http_parse.h; sourceTree = "<group>"; };
@ -571,7 +570,6 @@
92B9EB7A24E0518700E6CFB2 /* net_ifinfo.h */, 92B9EB7A24E0518700E6CFB2 /* net_ifinfo.h */,
92B9EB7B24E0518700E6CFB2 /* net_compat.h */, 92B9EB7B24E0518700E6CFB2 /* net_compat.h */,
92B9EB7C24E0518700E6CFB2 /* net_socket.h */, 92B9EB7C24E0518700E6CFB2 /* net_socket.h */,
92B9EB7D24E0518700E6CFB2 /* net_natt.h */,
92B9EB7E24E0518700E6CFB2 /* net_socket_ssl.h */, 92B9EB7E24E0518700E6CFB2 /* net_socket_ssl.h */,
92B9EB7F24E0518700E6CFB2 /* net_http.h */, 92B9EB7F24E0518700E6CFB2 /* net_http.h */,
92B9EB8024E0518700E6CFB2 /* net_http_parse.h */, 92B9EB8024E0518700E6CFB2 /* net_http_parse.h */,

2
pkg/apple/RetroArch_iOS13.xcodeproj/project.pbxproj
View File

@ -170,7 +170,6 @@
92B9EB7A24E0518700E6CFB2 /* net_ifinfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_ifinfo.h; sourceTree = "<group>"; }; 92B9EB7A24E0518700E6CFB2 /* net_ifinfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_ifinfo.h; sourceTree = "<group>"; };
92B9EB7B24E0518700E6CFB2 /* net_compat.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_compat.h; sourceTree = "<group>"; }; 92B9EB7B24E0518700E6CFB2 /* net_compat.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_compat.h; sourceTree = "<group>"; };
92B9EB7C24E0518700E6CFB2 /* net_socket.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_socket.h; sourceTree = "<group>"; }; 92B9EB7C24E0518700E6CFB2 /* net_socket.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_socket.h; sourceTree = "<group>"; };
92B9EB7D24E0518700E6CFB2 /* net_natt.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_natt.h; sourceTree = "<group>"; };
92B9EB7E24E0518700E6CFB2 /* net_socket_ssl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_socket_ssl.h; sourceTree = "<group>"; }; 92B9EB7E24E0518700E6CFB2 /* net_socket_ssl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_socket_ssl.h; sourceTree = "<group>"; };
92B9EB7F24E0518700E6CFB2 /* net_http.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_http.h; sourceTree = "<group>"; }; 92B9EB7F24E0518700E6CFB2 /* net_http.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_http.h; sourceTree = "<group>"; };
92B9EB8024E0518700E6CFB2 /* net_http_parse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_http_parse.h; sourceTree = "<group>"; }; 92B9EB8024E0518700E6CFB2 /* net_http_parse.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = net_http_parse.h; sourceTree = "<group>"; };
@ -637,7 +636,6 @@
92B9EB7A24E0518700E6CFB2 /* net_ifinfo.h */, 92B9EB7A24E0518700E6CFB2 /* net_ifinfo.h */,
92B9EB7B24E0518700E6CFB2 /* net_compat.h */, 92B9EB7B24E0518700E6CFB2 /* net_compat.h */,
92B9EB7C24E0518700E6CFB2 /* net_socket.h */, 92B9EB7C24E0518700E6CFB2 /* net_socket.h */,
92B9EB7D24E0518700E6CFB2 /* net_natt.h */,
92B9EB7E24E0518700E6CFB2 /* net_socket_ssl.h */, 92B9EB7E24E0518700E6CFB2 /* net_socket_ssl.h */,
92B9EB7F24E0518700E6CFB2 /* net_http.h */, 92B9EB7F24E0518700E6CFB2 /* net_http.h */,
92B9EB8024E0518700E6CFB2 /* net_http_parse.h */, 92B9EB8024E0518700E6CFB2 /* net_http_parse.h */,

2
tasks/task_netplay_nat_traversal.c
View File

@ -30,7 +30,7 @@
#include <net/net_ifinfo.h> #include <net/net_ifinfo.h>
#endif #endif
#include <net/net_natt.h> #include "../network/natt.h"
#include "../network/netplay/netplay.h" #include "../network/netplay/netplay.h"
/* Find the most suitable address within the device's network. */ /* Find the most suitable address within the device's network. */