|
@@ -16,6 +16,7 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru
|
|
char canon[256], *outcanon;
|
|
char canon[256], *outcanon;
|
|
int nservs, naddrs, nais, canon_len, i, j, k;
|
|
int nservs, naddrs, nais, canon_len, i, j, k;
|
|
int family = AF_UNSPEC, flags = 0, proto = 0, socktype = 0;
|
|
int family = AF_UNSPEC, flags = 0, proto = 0, socktype = 0;
|
|
|
|
+ int no_family = 0;
|
|
struct aibuf *out;
|
|
struct aibuf *out;
|
|
|
|
|
|
if (!host && !serv) return EAI_NONAME;
|
|
if (!host && !serv) return EAI_NONAME;
|
|
@@ -82,7 +83,7 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru
|
|
default:
|
|
default:
|
|
return EAI_SYSTEM;
|
|
return EAI_SYSTEM;
|
|
}
|
|
}
|
|
- if (family == tf[i]) return EAI_NONAME;
|
|
|
|
|
|
+ if (family == tf[i]) no_family = 1;
|
|
family = tf[1-i];
|
|
family = tf[1-i];
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -93,6 +94,8 @@ int getaddrinfo(const char *restrict host, const char *restrict serv, const stru
|
|
naddrs = __lookup_name(addrs, canon, host, family, flags);
|
|
naddrs = __lookup_name(addrs, canon, host, family, flags);
|
|
if (naddrs < 0) return naddrs;
|
|
if (naddrs < 0) return naddrs;
|
|
|
|
|
|
|
|
+ if (no_family) return EAI_NODATA;
|
|
|
|
+
|
|
nais = nservs * naddrs;
|
|
nais = nservs * naddrs;
|
|
canon_len = strlen(canon);
|
|
canon_len = strlen(canon);
|
|
out = calloc(1, nais * sizeof(*out) + canon_len + 1);
|
|
out = calloc(1, nais * sizeof(*out) + canon_len + 1);
|