From 08741a59387f1e4c628d385cfd87a9a616dde310 Mon Sep 17 00:00:00 2001
From: Xavier Roche <xroche@users.noreply.github.com>
Date: Sun, 15 Sep 2013 11:04:15 +0000
Subject: Remove scope id (% character) in dotted address resolution
 (especially for catchurl proxy)

---
 src/htsnet.h | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/htsnet.h b/src/htsnet.h
index e9c0629..6efe2ba 100644
--- a/src/htsnet.h
+++ b/src/htsnet.h
@@ -232,9 +232,15 @@ if (hpsize == sizeof(struct sockaddr_in6)) { \
 
 /* Get dotted address */
 #define SOCaddr_inetntoa(namebuf, namebuflen, ss, sslen) do { \
-(namebuf)[0]='\0'; \
-getnameinfo((struct sockaddr *)&(ss), sslen, \
-            (namebuf), namebuflen, NULL, 0, NI_NUMERICHOST); \
+  char *pos_; \
+  (namebuf)[0]='\0'; \
+  getnameinfo((struct sockaddr *)&(ss), sslen, \
+              (namebuf), namebuflen, NULL, 0, NI_NUMERICHOST); \
+  /* remove scope id */ \
+  pos_ = strrchr(namebuf, '%'); \
+  if (pos_ != NULL) { \
+    *pos_ = '\0'; \
+  } \
 } while(0)
 
 /* Get protocol ID */
-- 
cgit v1.2.3