chiark
/
gitweb
/
~ianmdlvl
/
adns.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f373592
)
rescope AFCORE (comment from mdw)
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 28 May 2014 17:09:33 +0000
(18:09 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Wed, 28 May 2014 17:09:33 +0000
(18:09 +0100)
src/addrfam.c
patch
|
blob
|
history
diff --git
a/src/addrfam.c
b/src/addrfam.c
index 69194cccae4e43007f7c7598e4ad0d01096ecb68..08fe7934d1df72d0c75a9fa8b5c96512248b094a 100644
(file)
--- a/
src/addrfam.c
+++ b/
src/addrfam.c
@@
-228,14
+228,14
@@
int adns_text2addr(const char *addr, uint16_t port, struct sockaddr *sa,
return EINVAL; \
}while(0)
- if (!strchr(addr, ':')) { /* INET */
-
#define AFCORE(INETx,SINx,sinx) \
af= AF_##INETx; \
dst = &SINx(sa)->sinx##_addr; \
portp = &SINx(sa)->sinx##_port; \
needlen= sizeof(*SINx(sa));
+ if (!strchr(addr, ':')) { /* INET */
+
AFCORE(INET,SIN,sin);
} else { /* INET6 */
@@
-255,10
+255,10
@@
int adns_text2addr(const char *addr, uint16_t port, struct sockaddr *sa,
af_debug("will parse scoped address `%s' %% `%s'", parse, scopestr);
}
-#undef AFCORE
-
}
+#undef AFCORE
+
if (*salen < needlen) {
*salen = needlen;
return ENOSPC;