Skip to content
Snippets Groups Projects
Commit 9d475e7e authored by Konstantin Osipov's avatar Konstantin Osipov
Browse files

Merge branch 'freebsd-fix' into stable

parents e7977ad2 6c78b6ec
No related branches found
No related tags found
No related merge requests found
......@@ -228,7 +228,14 @@ getaddrinfo_cb(va_list ap)
*
* See for details: https://bugs.launchpad.net/tarantool/+bug/1160877
*/
if (rc == EAI_ADDRFAMILY || rc == EAI_BADFLAGS) {
/* EAI_ADDRFAMILY is deprecated on FreeBSD */
#ifdef EAI_ADDRFAMILY
int is_rc = EAI_BADFLAGS|EAI_ADDRFAMILY;
#else
int is_rc = EAI_BADFLAGS;
#endif
if (rc == is_rc) {
hints->ai_flags &= ~AI_ADDRCONFIG;
rc = getaddrinfo(host, port, hints, res);
}
......
......@@ -271,7 +271,8 @@ ssize_t
sio_sendto(int fd, const void *buf, size_t len, int flags,
const struct sockaddr_in *dest_addr, socklen_t addrlen)
{
ssize_t n = sendto(fd, buf, len, flags, dest_addr, addrlen);
ssize_t n = sendto(fd, buf, len, flags, (struct sockaddr*)dest_addr,
addrlen);
if (n < 0 && errno != EAGAIN &&
errno != EWOULDBLOCK && errno != EINTR)
tnt_raise(SocketError, :fd in:"sendto(%zd)", len);
......@@ -283,7 +284,8 @@ ssize_t
sio_recvfrom(int fd, void *buf, size_t len, int flags,
struct sockaddr_in *src_addr, socklen_t *addrlen)
{
ssize_t n = recvfrom(fd, buf, len, flags, src_addr, addrlen);
ssize_t n = recvfrom(fd, buf, len, flags, (struct sockaddr*)src_addr,
addrlen);
if (n < 0 && errno != EAGAIN &&
errno != EWOULDBLOCK && errno != EINTR)
tnt_raise(SocketError, :fd in:"recvfrom(%zd)", len);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment