Skip to content
Snippets Groups Projects
Commit 5ecf99b4 authored by deuce's avatar deuce
Browse files

Use the new union xp_sockaddr

parent 23d2491d
Branches
Tags
No related merge requests found
...@@ -169,7 +169,7 @@ BOOL xpms_add_list(struct xpms_set *xpms_set, int domain, int type, ...@@ -169,7 +169,7 @@ BOOL xpms_add_list(struct xpms_set *xpms_set, int domain, int type,
return one_good; return one_good;
} }
SOCKET xpms_accept(struct xpms_set *xpms_set, struct sockaddr * addr, SOCKET xpms_accept(struct xpms_set *xpms_set, union xp_sockaddr * addr,
socklen_t * addrlen, unsigned int timeout, void **cb_data) socklen_t * addrlen, unsigned int timeout, void **cb_data)
{ {
fd_set read_fs; fd_set read_fs;
...@@ -208,7 +208,7 @@ SOCKET xpms_accept(struct xpms_set *xpms_set, struct sockaddr * addr, ...@@ -208,7 +208,7 @@ SOCKET xpms_accept(struct xpms_set *xpms_set, struct sockaddr * addr,
if(FD_ISSET(xpms_set->socks[i].sock, &read_fs)) { if(FD_ISSET(xpms_set->socks[i].sock, &read_fs)) {
if(cb_data) if(cb_data)
*cb_data=xpms_set->socks[i].cb_data; *cb_data=xpms_set->socks[i].cb_data;
return accept(xpms_set->socks[i].sock, addr, addrlen); return accept(xpms_set->socks[i].sock, &addr->addr, addrlen);
} }
if(FD_ISSET(xpms_set->socks[i].sock, &except_fs)) { if(FD_ISSET(xpms_set->socks[i].sock, &except_fs)) {
closesocket(xpms_set->socks[i].sock); closesocket(xpms_set->socks[i].sock);
......
...@@ -39,7 +39,7 @@ BOOL xpms_add(struct xpms_set *xpms_set, int domain, int type, ...@@ -39,7 +39,7 @@ BOOL xpms_add(struct xpms_set *xpms_set, int domain, int type,
BOOL xpms_add_list(struct xpms_set *xpms_set, int domain, int type, BOOL xpms_add_list(struct xpms_set *xpms_set, int domain, int type,
int protocol, str_list_t list, uint16_t default_port, const char *prot, int protocol, str_list_t list, uint16_t default_port, const char *prot,
void (*sock_init)(SOCKET, void *), int(*bind_init)(BOOL), void *cbdata); void (*sock_init)(SOCKET, void *), int(*bind_init)(BOOL), void *cbdata);
SOCKET xpms_accept(struct xpms_set *, struct sockaddr * addr, SOCKET xpms_accept(struct xpms_set *, union xp_sockaddr * addr,
socklen_t * addrlen, unsigned int timeout, void **cb_data); socklen_t * addrlen, unsigned int timeout, void **cb_data);
#ifdef __cplusplus #ifdef __cplusplus
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment