From acfe990ec6e322377936fe06d7dd29274c23bbd3 Mon Sep 17 00:00:00 2001 From: Cthulhu-throwaway <96153783+Cthulhu-throwaway@users.noreply.github.com> Date: Tue, 26 Jul 2022 07:16:53 -0300 Subject: [PATCH] (Netplay/Vita) Enable partial LAN discovery (#14222) --- Makefile.griffin | 1 + Makefile.vita | 1 + network/netplay/netplay_frontend.c | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile.griffin b/Makefile.griffin index 573ffc891f..3a998778e2 100644 --- a/Makefile.griffin +++ b/Makefile.griffin @@ -345,6 +345,7 @@ else ifeq ($(platform), vita) HAVE_7ZIP := 1 HAVE_VITA2D := 1 HAVE_NETWORKING := 1 + HAVE_NETPLAYDISCOVERY := 1 HAVE_OVERLAY := 1 HAVE_VIDEO_LAYOUT := 0 HAVE_MATERIALUI := 1 diff --git a/Makefile.vita b/Makefile.vita index 85408ca3b8..91cb6b45d8 100644 --- a/Makefile.vita +++ b/Makefile.vita @@ -75,6 +75,7 @@ else HAVE_VITAGL := 0 endif HAVE_NETWORKING := 1 + HAVE_NETPLAYDISCOVERY := 1 HAVE_SOCKET_LEGACY := 1 HAVE_MENU := 1 HAVE_MENU_COMMON := 1 diff --git a/network/netplay/netplay_frontend.c b/network/netplay/netplay_frontend.c index ce2fed6258..28420b8837 100644 --- a/network/netplay/netplay_frontend.c +++ b/network/netplay/netplay_frontend.c @@ -8550,7 +8550,9 @@ static bool netplay_pre_frame(netplay_t *netplay) { settings_t *settings = config_get_ptr(); -#ifdef HAVE_NETPLAYDISCOVERY +/* Vita can't bind to our discovery port; + do not try to answer discovery queries there. */ +#if defined(HAVE_NETPLAYDISCOVERY) && !defined(VITA) if (!netplay->mitm_handler) { net_driver_state_t *net_st = &networking_driver_st;