#include <openssl/err.h>
#include <openssl/buffer.h>
+#include <ctype.h>
/*
* Throughout this file and bio_lcl.h, the existence of the macro
BIO_ADDR *BIO_ADDR_new(void)
{
- BIO_ADDR *ret = (BIO_ADDR *)OPENSSL_zalloc(sizeof(BIO_ADDR));
+ BIO_ADDR *ret = OPENSSL_zalloc(sizeof(*ret));
+
+ ret->sa.sa_family = AF_UNSPEC;
return ret;
}
OPENSSL_free(ap);
}
+void BIO_ADDR_clear(BIO_ADDR *ap)
+{
+ memset(ap, 0, sizeof(*ap));
+ ap->sa.sa_family = AF_UNSPEC;
+}
+
/*
* BIO_ADDR_make - non-public routine to fill a BIO_ADDR with the contents
* of a struct sockaddr.
if (1) {
#ifdef AI_PASSIVE
int ret = 0;
- char host[NI_MAXHOST], serv[NI_MAXSERV];
+ char host[NI_MAXHOST] = "", serv[NI_MAXSERV] = "";
int flags = 0;
if (numeric)
}
return 0;
}
+
+ /* VMS getnameinfo() has a bug, it doesn't fill in serv, which
+ * leaves it with whatever garbage that happens to be there.
+ * However, we initialise serv with the empty string (serv[0]
+ * is therefore NUL), so it gets real easy to detect when things
+ * didn't go the way one might expect.
+ */
+ if (serv[0] == '\0') {
+ BIO_snprintf(serv, sizeof(serv), "%d",
+ ntohs(BIO_ADDR_rawport(ap)));
+ }
+
if (hostname)
*hostname = OPENSSL_strdup(host);
if (service)
/**********************************************************************
*
- * Address into database
+ * Address info database
*
*/
int BIO_ADDRINFO_protocol(const BIO_ADDRINFO *bai)
{
- if (bai != NULL)
- return bai->bai_protocol;
+ if (bai != NULL) {
+ if (bai->bai_protocol != 0)
+ return bai->bai_protocol;
+
+#ifdef AF_UNIX
+ if (bai->bai_family == AF_UNIX)
+ return 0;
+#endif
+
+ switch (bai->bai_socktype) {
+ case SOCK_STREAM:
+ return IPPROTO_TCP;
+ case SOCK_DGRAM:
+ return IPPROTO_UDP;
+ default:
+ break;
+ }
+ }
return 0;
}
}
}
- if (strchr(p, ':'))
+ if (p != NULL && strchr(p, ':'))
goto spec_err;
if (h != NULL && host != NULL) {
{
OPENSSL_assert(bai != NULL);
- *bai = (BIO_ADDRINFO *)OPENSSL_zalloc(sizeof(**bai));
-
+ *bai = OPENSSL_zalloc(sizeof(**bai));
if (*bai == NULL)
return 0;
+
(*bai)->bai_family = family;
(*bai)->bai_socktype = socktype;
if (socktype == SOCK_STREAM)