piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-25 07:10:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix slirp crash when exiting without having inited slirp

Browse Source 
also fix misc bugs
This commit is contained in:
Arisotura
2020-06-16 14:09:54 +02:00
parent 1101ed773b
commit 91ff63a194
2 changed files with 33 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/frontend/qt_sdl/LAN_Socket.cpp
View File

@ -52,7 +52,7 @@ volatile int RXNum;
u32 IPv4ID;
Slirp* Ctx;
Slirp* Ctx = nullptr;
const int FDListMax = 64;
struct pollfd FDList[FDListMax];
@ -164,6 +164,7 @@ void SlirpCbUnregisterPollFD(int fd, void* opaque)
void SlirpCbNotify(void* opaque)
{
printf("Slirp: notify???\n");
}
SlirpCb cb =
@ -205,7 +206,11 @@ bool Init()
void DeInit()
{
slirp_cleanup(Ctx);
if (Ctx)
{
slirp_cleanup(Ctx);
Ctx = nullptr;
}
}
@ -411,6 +416,8 @@ void HandleDNSFrame(u8* data, int len)
int SendPacket(u8* data, int len)
{
if (!Ctx) return 0;
if (len > 2048)
{
printf("LAN_SendPacket: error: packet too long (%d)\n", len);
@ -496,6 +503,8 @@ int SlirpCbGetREvents(int idx, void* opaque)
int RecvPacket(u8* data)
{
if (!Ctx) return 0;
int ret = 0;
if (FDListSize > 0)