From 0569cc958f0d4bd3ba61d24f6a2dcd55e0bdde2b Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Sun, 1 Sep 2013 03:44:37 +0000
Subject: [PATCH] Fix callback data and resolution of [fec0::1]:80 style
addresses in xpms_add_list().
---
src/xpdev/multisock.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/xpdev/multisock.c b/src/xpdev/multisock.c
index 0e85842af7..0fae431306 100644
--- a/src/xpdev/multisock.c
+++ b/src/xpdev/multisock.c
@@ -140,6 +140,7 @@ BOOL xpms_add_list(struct xpms_set *xpms_set, int domain, int type,
{
char **iface;
char *host;
+ char *host_str;
char *p, *p2;
BOOL one_good=FALSE;
@@ -147,10 +148,12 @@ BOOL xpms_add_list(struct xpms_set *xpms_set, int domain, int type,
host=strdup(*iface);
WORD port=default_port;
+ host_str=host;
if(xpms_set->lprintf)
xpms_set->lprintf(LOG_INFO, "Adding %s listening socket on %s", prot, host);
p = strrchr(host, ':');
if(host[0]=='[') {
+ host_str++;
p2=strrchr(host,']');
if(p2)
*p2=0;
@@ -161,7 +164,7 @@ BOOL xpms_add_list(struct xpms_set *xpms_set, int domain, int type,
*(p++)=0;
sscanf(p, "%hu", &port);
}
- if(xpms_add(xpms_set, PF_UNSPEC, SOCK_STREAM, 0, host, port, prot, sock_init, bind_init, NULL))
+ if(xpms_add(xpms_set, PF_UNSPEC, SOCK_STREAM, 0, host_str, port, prot, sock_init, bind_init, cbdata))
one_good=TRUE;
free(host);
}
--
GitLab