2910aa77b2
`network.cpp` has several error paths which either:
- report "Unhandled host socket error=n" and return `SUCCESS`, or
- switch on a few possible errors, log them, and translate them to
Errno; the same switch statement is copied and pasted in multiple
places in the code
Convert these paths to use a helper function `GetAndLogLastError`, which
is roughly the equivalent of one of the switch statements, but:
- handling more cases (both ones that were already in `Errno`, and a few
more I added), and
- using OS functions to convert the error to a string when logging, so
it'll describe the error even if it's not one of the ones in the
switch statement.
- To handle this, refactor the logic in `GetLastErrorMsg` to expose a
new function `NativeErrorToString` which takes the error number
explicitly as an argument. And improve the Windows version a bit.
Also, add a test which exercises two random error paths.
52 lines
1.5 KiB
C++
52 lines
1.5 KiB
C++
// Copyright 2013 Dolphin Emulator Project / 2014 Citra Emulator Project
|
|
// Licensed under GPLv2 or any later version
|
|
// Refer to the license.txt file included.
|
|
|
|
#include <cstddef>
|
|
#ifdef _WIN32
|
|
#include <windows.h>
|
|
#else
|
|
#include <cerrno>
|
|
#include <cstring>
|
|
#endif
|
|
|
|
#include "common/common_funcs.h"
|
|
|
|
std::string NativeErrorToString(int e) {
|
|
#ifdef _WIN32
|
|
LPSTR err_str;
|
|
|
|
DWORD res = FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_ALLOCATE_BUFFER |
|
|
FORMAT_MESSAGE_IGNORE_INSERTS,
|
|
nullptr, e, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
|
|
reinterpret_cast<LPSTR>(&err_str), 1, nullptr);
|
|
if (!res) {
|
|
return "(FormatMessageA failed to format error)";
|
|
}
|
|
std::string ret(err_str);
|
|
LocalFree(err_str);
|
|
return ret;
|
|
#else
|
|
char err_str[255];
|
|
#if defined(__GLIBC__) && (_GNU_SOURCE || (_POSIX_C_SOURCE < 200112L && _XOPEN_SOURCE < 600))
|
|
// Thread safe (GNU-specific)
|
|
const char* str = strerror_r(e, err_str, sizeof(err_str));
|
|
return std::string(str);
|
|
#else
|
|
// Thread safe (XSI-compliant)
|
|
int second_err = strerror_r(e, err_str, sizeof(err_str));
|
|
if (second_err != 0) {
|
|
return "(strerror_r failed to format error)";
|
|
}
|
|
return std::string(err_str);
|
|
#endif // GLIBC etc.
|
|
#endif // _WIN32
|
|
}
|
|
|
|
std::string GetLastErrorMsg() {
|
|
#ifdef _WIN32
|
|
return NativeErrorToString(GetLastError());
|
|
#else
|
|
return NativeErrorToString(errno);
|
|
#endif
|
|
}
|