mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 12:32:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

sfdnsres: timeout parameter is actually cancel_handle

Browse Source
This commit is contained in:
fincs 2019-10-27 23:47:50 +01:00
parent 26f620dc0e
commit a2c35fb2e7
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nx/include/switch/services/sfdnsres.h
View File

@ -10,11 +10,11 @@
// SetDnsAddressesPrivateRequest & GetDnsAddressPrivateRequest are stubbed
Result sfdnsresGetHostByNameRequest(u32 timeout, bool use_nsd, const char *name, u32 *ret, u32 *errno_, void *out_buffer, size_t out_buffer_size, u32 *out_serialized_size);
Result sfdnsresGetHostByAddrRequest(const void *in_addr, size_t in_addr_len, u32 type, u32 timeout, u32 *ret, u32 *errno_, void *out_buffer, size_t out_buffer_size, u32 *out_serialized_size);
Result sfdnsresGetHostByNameRequest(u32 cancel_handle, bool use_nsd, const char *name, u32 *ret, u32 *errno_, void *out_buffer, size_t out_buffer_size, u32 *out_serialized_size);
Result sfdnsresGetHostByAddrRequest(const void *in_addr, size_t in_addr_len, u32 type, u32 cancel_handle, u32 *ret, u32 *errno_, void *out_buffer, size_t out_buffer_size, u32 *out_serialized_size);
Result sfdnsresGetHostStringErrorRequest(u32 err, char *out_str, size_t out_str_size);
Result sfdnsresGetGaiStringErrorRequest(u32 err, char *out_str, size_t out_str_size);
Result sfdnsresGetAddrInfoRequest(u32 timeout, bool use_nsd, const char *node, const char *service, const void *in_hints, size_t in_hints_size, void *out_buffer, size_t out_buffer_size, u32 *errno_, s32 *gaie, u32 *out_serialized_size);
Result sfdnsresGetNameInfoRequest(u32 flags, const void *in_sa, size_t in_sa_size, char *out_host, size_t out_host_size, char *out_serv, size_t out_serv_len, u32 timeout, u32 *errno_, s32 *gaie);
Result sfdnsresGetAddrInfoRequest(u32 cancel_handle, bool use_nsd, const char *node, const char *service, const void *in_hints, size_t in_hints_size, void *out_buffer, size_t out_buffer_size, u32 *errno_, s32 *gaie, u32 *out_serialized_size);
Result sfdnsresGetNameInfoRequest(u32 flags, const void *in_sa, size_t in_sa_size, char *out_host, size_t out_host_size, char *out_serv, size_t out_serv_len, u32 cancel_handle, u32 *errno_, s32 *gaie);
Result sfdnsresGetCancelHandleRequest(u32 *out_handle);
Result sfdnsresCancelRequest(u32 handle);

24
nx/source/services/sfdnsres.c
View File

@ -70,12 +70,12 @@ static Result _sfdnsresCmdInErrOutStr(u32 err, char *out_str, size_t out_str_siz
);
}
Result sfdnsresGetHostByNameRequest(u32 timeout, bool use_nsd, const char *name, u32 *ret, u32 *errno_, void *out_buffer, size_t out_buffer_size, u32 *out_serialized_size) {
Result sfdnsresGetHostByNameRequest(u32 cancel_handle, bool use_nsd, const char *name, u32 *ret, u32 *errno_, void *out_buffer, size_t out_buffer_size, u32 *out_serialized_size) {
const struct {
u32 use_nsd; // actually u8 bool, but promoted to u32 for convenience
u32 timeout;
u32 cancel_handle;
u64 pid_placeholder;
} in = { use_nsd ? 1 : 0, timeout, 0 };
} in = { use_nsd ? 1 : 0, cancel_handle, 0 };
struct {
u32 ret;
@ -104,14 +104,14 @@ Result sfdnsresGetHostByNameRequest(u32 timeout, bool use_nsd, const char *name,
return rc;
}
Result sfdnsresGetHostByAddrRequest(const void *in_addr, size_t in_addr_len, u32 type, u32 timeout, u32 *ret, u32 *errno_, void *out_buffer, size_t out_buffer_size, u32 *out_serialized_size) {
Result sfdnsresGetHostByAddrRequest(const void *in_addr, size_t in_addr_len, u32 type, u32 cancel_handle, u32 *ret, u32 *errno_, void *out_buffer, size_t out_buffer_size, u32 *out_serialized_size) {
const struct {
u32 len; // wtf nintendo
u32 type;
u32 timeout;
u32 cancel_handle;
u32 _padding;
u64 pid_placeholder;
} in = { (u32)in_addr_len, type, timeout, 0, 0 };
} in = { (u32)in_addr_len, type, cancel_handle, 0, 0 };
struct {
u32 ret;
@ -147,12 +147,12 @@ Result sfdnsresGetGaiStringErrorRequest(u32 err, char *out_str, size_t out_str_s
return _sfdnsresCmdInErrOutStr(err, out_str, out_str_size, 5);
}
Result sfdnsresGetAddrInfoRequest(u32 timeout, bool use_nsd, const char *node, const char *service, const void *in_hints, size_t in_hints_size, void *out_buffer, size_t out_buffer_size, u32 *errno_, s32 *gaie, u32 *out_serialized_size) {
Result sfdnsresGetAddrInfoRequest(u32 cancel_handle, bool use_nsd, const char *node, const char *service, const void *in_hints, size_t in_hints_size, void *out_buffer, size_t out_buffer_size, u32 *errno_, s32 *gaie, u32 *out_serialized_size) {
const struct {
u32 use_nsd; // actually u8 bool, but promoted to u32 for convenience
u32 timeout;
u32 cancel_handle;
u64 pid_placeholder;
} in = { use_nsd ? 1 : 0, timeout, 0 };
} in = { use_nsd ? 1 : 0, cancel_handle, 0 };
struct {
u32 errno_;
@ -185,12 +185,12 @@ Result sfdnsresGetAddrInfoRequest(u32 timeout, bool use_nsd, const char *node, c
return rc;
}
Result sfdnsresGetNameInfoRequest(u32 flags, const void *in_sa, size_t in_sa_size, char *out_host, size_t out_host_size, char *out_serv, size_t out_serv_len, u32 timeout, u32 *errno_, s32 *gaie) {
Result sfdnsresGetNameInfoRequest(u32 flags, const void *in_sa, size_t in_sa_size, char *out_host, size_t out_host_size, char *out_serv, size_t out_serv_len, u32 cancel_handle, u32 *errno_, s32 *gaie) {
const struct {
u32 flags;
u32 timeout;
u32 cancel_handle;
u64 pid_placeholder;
} in = { flags, timeout, 0 };
} in = { flags, cancel_handle, 0 };
struct {
u32 errno_;