From 5ecf99b47a0a64f72b78e930acf2f09783c4d462 Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Wed, 4 Sep 2013 07:54:50 +0000
Subject: [PATCH] Use the new union xp_sockaddr
---
src/xpdev/multisock.c | 4 ++--
src/xpdev/multisock.h | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/xpdev/multisock.c b/src/xpdev/multisock.c
index 5f86af18ea..4f536613ce 100644
--- a/src/xpdev/multisock.c
+++ b/src/xpdev/multisock.c
@@ -169,7 +169,7 @@ BOOL xpms_add_list(struct xpms_set *xpms_set, int domain, int type,
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)
{
fd_set read_fs;
@@ -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(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)) {
closesocket(xpms_set->socks[i].sock);
diff --git a/src/xpdev/multisock.h b/src/xpdev/multisock.h
index 5af662a955..4bca6982bc 100644
--- a/src/xpdev/multisock.h
+++ b/src/xpdev/multisock.h
@@ -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,
int protocol, str_list_t list, uint16_t default_port, const char *prot,
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);
#ifdef __cplusplus
--
GitLab