mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-07-03 10:02:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

htcs: change HtcsSockAddr name

Browse Source
This commit is contained in:
Michael Scire 2021-03-16 14:41:32 -07:00
parent d4936d7654
commit 7ec4578b76
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,7 +30,7 @@ typedef struct {
HtcsAddressFamilyType family; HtcsAddressFamilyType family;
HtcsPeerName peer_name; HtcsPeerName peer_name;
HtcsPortName port_name; HtcsPortName port_name;
} SockAddrHtcs; } HtcsSockAddr;
typedef struct { typedef struct {
s64 tv_sec; s64 tv_sec;
@ -123,14 +123,14 @@ Result htcsEndSelect(s32 *out_err, s32 *out_count, s32 *read, size_t num_read, s
/// Socket functionality. /// Socket functionality.
Result htcsSocketClose(HtcsSocket *s, s32 *out_err, s32 *out_res); Result htcsSocketClose(HtcsSocket *s, s32 *out_err, s32 *out_res);
Result htcsSocketConnect(HtcsSocket *s, s32 *out_err, s32 *out_res, const SockAddrHtcs *address); Result htcsSocketConnect(HtcsSocket *s, s32 *out_err, s32 *out_res, const HtcsSockAddr *address);
Result htcsSocketBind(HtcsSocket *s, s32 *out_err, s32 *out_res, const SockAddrHtcs *address); Result htcsSocketBind(HtcsSocket *s, s32 *out_err, s32 *out_res, const HtcsSockAddr *address);
Result htcsSocketListen(HtcsSocket *s, s32 *out_err, s32 *out_res, s32 backlog_count); Result htcsSocketListen(HtcsSocket *s, s32 *out_err, s32 *out_res, s32 backlog_count);
Result htcsSocketShutdown(HtcsSocket *s, s32 *out_err, s32 *out_res, s32 how); Result htcsSocketShutdown(HtcsSocket *s, s32 *out_err, s32 *out_res, s32 how);
Result htcsSocketFcntl(HtcsSocket *s, s32 *out_err, s32 *out_res, s32 command, s32 value); Result htcsSocketFcntl(HtcsSocket *s, s32 *out_err, s32 *out_res, s32 command, s32 value);
Result htcsSocketAcceptStart(HtcsSocket *s, u32 *out_task_id, Handle *out_event_handle); Result htcsSocketAcceptStart(HtcsSocket *s, u32 *out_task_id, Handle *out_event_handle);
Result htcsSocketAcceptResults(HtcsSocket *s, s32 *out_err, HtcsSocket *out_socket, SockAddrHtcs *out_address, u32 task_id); Result htcsSocketAcceptResults(HtcsSocket *s, s32 *out_err, HtcsSocket *out_socket, HtcsSockAddr *out_address, u32 task_id);
Result htcsSocketRecvStart(HtcsSocket *s, u32 *out_task_id, Handle *out_event_handle, s32 mem_size, s32 flags); Result htcsSocketRecvStart(HtcsSocket *s, u32 *out_task_id, Handle *out_event_handle, s32 mem_size, s32 flags);
Result htcsSocketRecvResults(HtcsSocket *s, s32 *out_err, s64 *out_size, void *buffer, size_t buffer_size, u32 task_id); Result htcsSocketRecvResults(HtcsSocket *s, s32 *out_err, s64 *out_size, void *buffer, size_t buffer_size, u32 task_id);

10
nx/source/services/htcs.c
View File

@ -168,7 +168,7 @@ Result htcsEndSelect(s32 *out_err, s32 *out_count, s32 *read, size_t num_read, s
return rc; return rc;
} }
static Result _htcsSocketCmdInAddress(HtcsSocket *s, s32 *out_err, s32 *out_res, const SockAddrHtcs *address, u32 cmd_id) { static Result _htcsSocketCmdInAddress(HtcsSocket *s, s32 *out_err, s32 *out_res, const HtcsSockAddr *address, u32 cmd_id) {
struct { struct {
s32 err; s32 err;
s32 res; s32 res;
@ -220,11 +220,11 @@ Result htcsSocketClose(HtcsSocket *s, s32 *out_err, s32 *out_res) {
return rc; return rc;
} }
Result htcsSocketConnect(HtcsSocket *s, s32 *out_err, s32 *out_res, const SockAddrHtcs *address) { Result htcsSocketConnect(HtcsSocket *s, s32 *out_err, s32 *out_res, const HtcsSockAddr *address) {
return _htcsSocketCmdInAddress(s, out_err, out_res, address, 1); return _htcsSocketCmdInAddress(s, out_err, out_res, address, 1);
} }
Result htcsSocketBind(HtcsSocket *s, s32 *out_err, s32 *out_res, const SockAddrHtcs *address) { Result htcsSocketBind(HtcsSocket *s, s32 *out_err, s32 *out_res, const HtcsSockAddr *address) {
return _htcsSocketCmdInAddress(s, out_err, out_res, address, 2); return _htcsSocketCmdInAddress(s, out_err, out_res, address, 2);
} }
@ -260,9 +260,9 @@ Result htcsSocketAcceptStart(HtcsSocket *s, u32 *out_task_id, Handle *out_event_
); );
} }
Result htcsSocketAcceptResults(HtcsSocket *s, s32 *out_err, HtcsSocket *out_socket, SockAddrHtcs *out_address, u32 task_id) { Result htcsSocketAcceptResults(HtcsSocket *s, s32 *out_err, HtcsSocket *out_socket, HtcsSockAddr *out_address, u32 task_id) {
struct { struct {
SockAddrHtcs address; HtcsSockAddr address;
s32 err; s32 err;
} out; } out;
Result rc = _htcsObjectDispatchInOut(&s->s, 10, task_id, out, Result rc = _htcsObjectDispatchInOut(&s->s, 10, task_id, out,